From c64029af7aba4d885977f5d9aab2b5c5536d5c9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Fri, 3 Oct 2014 22:03:08 +0200 Subject: RPM Packaging: update kopete-otr --- redhat/applications/kopete-otr/kopete-otr-14.0.0.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'redhat/applications') diff --git a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec b/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec index 835c6b649..854bd79c9 100644 --- a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec +++ b/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec @@ -54,13 +54,11 @@ BuildRequires: desktop-file-utils BuildRequires: trinity-tdenetwork-devel >= %{tde_version} -# Kopete is provided by kdenetwork +# Kopete is provided by tdenetwork Requires: trinity-kopete >= %{tde_version} -%if 0%{?suse_version} >= 1230 -BuildRequires: libotr2-devel -%else + +# OTR support BuildRequires: libotr-devel -%endif %description This plugin enables Off-The-Record encryption for the TDE instant @@ -102,7 +100,7 @@ export PATH="%{tde_bindir}:${PATH}" --enable-rpath \ --disable-gcc-hidden-visibility -%__make %{_smp_mflags} +%__make %{_smp_mflags} || %__make %install -- cgit v1.2.1 From e6514292cef38549a22e8bd792663ad5c9b31567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Fri, 3 Oct 2014 22:08:25 +0200 Subject: RPM Packaging: update some packages --- redhat/applications/krusader/krusader-3.5.13.2.spec | 3 ++- redhat/applications/tork/tork-14.0.0.spec | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'redhat/applications') diff --git a/redhat/applications/krusader/krusader-3.5.13.2.spec b/redhat/applications/krusader/krusader-3.5.13.2.spec index a5e2f7623..22728025c 100644 --- a/redhat/applications/krusader/krusader-3.5.13.2.spec +++ b/redhat/applications/krusader/krusader-3.5.13.2.spec @@ -87,7 +87,8 @@ great on your desktop. %build -unset QTDIR; . /etc/profile.d/qt3.sh +unset QTDIR QTINC QTLIB +. /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" # Warning: --enable-final causes FTBFS diff --git a/redhat/applications/tork/tork-14.0.0.spec b/redhat/applications/tork/tork-14.0.0.spec index 35595c05c..a750ee4e4 100644 --- a/redhat/applications/tork/tork-14.0.0.spec +++ b/redhat/applications/tork/tork-14.0.0.spec @@ -114,6 +114,7 @@ done %doc AUTHORS COPYING README TODO ChangeLog USINGTORK %{tde_bindir}/tork %{tde_bindir}/torkarkollon +%{tde_bindir}/usewithtor %{tde_tdeappdir}/tork.desktop %{tde_datadir}/apps/konqueror/servicemenus/tork_downloadwithfirefox.desktop %{tde_datadir}/apps/konqueror/servicemenus/tork_downloadwithkonqueror.desktop -- cgit v1.2.1 From 7b7982286c26e1d2464e4be9adeb03f27f984238 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Fri, 3 Oct 2014 22:17:49 +0200 Subject: RPM Packaging: update tde-i18n --- redhat/applications/bibletime/bibletime-14.0.0.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'redhat/applications') diff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime-14.0.0.spec index 02b0f8a64..0fd3639ec 100644 --- a/redhat/applications/bibletime/bibletime-14.0.0.spec +++ b/redhat/applications/bibletime/bibletime-14.0.0.spec @@ -26,7 +26,7 @@ Name: trinity-%{tde_pkg} Summary: A bible study tool for Trinity Version: 1.6.6.0 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -102,7 +102,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" --enable-rpath \ --disable-gcc-hidden-visibility \ \ -%if 0%{?fedora} >= 20 || 0%{?pclinuxos} || 0%{?rhel} >= 7 +%if 0%{?pclinuxos} || 0%{?rhel} >= 7 --with-sword-dir=%{tde_prefix} %endif -- cgit v1.2.1 From 3874a59988bcd5c975928863e9a0cd792cb5f780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sat, 4 Oct 2014 20:02:44 +0200 Subject: RPM Packaging: update R14 packages --- redhat/applications/krecipes/krecipes-14.0.0.spec | 26 ++++++++++------------- 1 file changed, 11 insertions(+), 15 deletions(-) (limited to 'redhat/applications') diff --git a/redhat/applications/krecipes/krecipes-14.0.0.spec b/redhat/applications/krecipes/krecipes-14.0.0.spec index b90f1eb85..43af9cd92 100644 --- a/redhat/applications/krecipes/krecipes-14.0.0.spec +++ b/redhat/applications/krecipes/krecipes-14.0.0.spec @@ -1,27 +1,27 @@ # Default version for this component %define tde_pkg krecipes -%define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif -# TDE specific building variables +# TDE variables +%define tde_version 14.0.0 +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man - %define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity - %define _docdir %{tde_docdir} +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + + Name: trinity-%{tde_pkg} Summary: Recipes manager for TDE @@ -40,10 +40,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext @@ -64,7 +61,7 @@ with available ingredients and a diet helper. It can also import or export recipes from files in various format (eg RecipeML or Meal-Master) or from databases. -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} %debug_package %endif @@ -81,7 +78,6 @@ databases. %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -104,7 +100,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --with-mysql \ --with-postgresql -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install -- cgit v1.2.1