diff options
author | François Andriot <[email protected]> | 2015-03-21 17:25:00 +0100 |
---|---|---|
committer | François Andriot <[email protected]> | 2015-03-21 17:25:00 +0100 |
commit | de823e19c005ecda21e4739de9aae33f0a0590ae (patch) | |
tree | 7ce5e46dc5b853ff2ff3ceda6e9122aa5301a0f4 /redhat/applications | |
parent | 056a3e9bfa2213b295ab52a4881625504203eeef (diff) | |
download | tde-packaging-de823e19c005ecda21e4739de9aae33f0a0590ae.tar.gz tde-packaging-de823e19c005ecda21e4739de9aae33f0a0590ae.zip |
RPM Packaging: rebuild for Fedora 21, RHEL 7, and minor fixes
Diffstat (limited to 'redhat/applications')
7 files changed, 11 insertions, 6 deletions
diff --git a/redhat/applications/abakus/abakus-14.0.0.spec b/redhat/applications/abakus/abakus-14.0.0.spec index 432f84e0d..6657714e1 100644 --- a/redhat/applications/abakus/abakus-14.0.0.spec +++ b/redhat/applications/abakus/abakus-14.0.0.spec @@ -151,6 +151,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_tdedocdir}/HTML/en/abakus/ %{tde_datadir}/applnk/Utilities/abakus.desktop + %changelog * Fri Jul 05 2013 Francois Andriot <[email protected]> - 2:0.91-1 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/basket/basket-14.0.0.spec b/redhat/applications/basket/basket-14.0.0.spec index e930a2de1..12132ac3c 100644 --- a/redhat/applications/basket/basket-14.0.0.spec +++ b/redhat/applications/basket/basket-14.0.0.spec @@ -36,8 +36,8 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0.3.1 Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} -Group: Applications/Utilities Summary: Taking care of your ideas. +Group: Applications/Utilities URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} diff --git a/redhat/applications/digikam/digikam-14.0.0.spec b/redhat/applications/digikam/digikam-14.0.0.spec index 15db96b07..d58b9e5c7 100644 --- a/redhat/applications/digikam/digikam-14.0.0.spec +++ b/redhat/applications/digikam/digikam-14.0.0.spec @@ -35,7 +35,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.9.6 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Summary: Digital photo management application for TDE Group: Applications/Utilities URL: http://www.trinitydesktop.org/ @@ -389,5 +389,8 @@ install -D -m 644 "%{SOURCE1}" "$RPM_BUILD_ROOT%{tde_datadir}/apps/konqueror/ser %changelog +* Mon Feb 02 2015 Francois Andriot <[email protected]> - 2:0.9.6-2 +- Rebuild on Fedora 21 for updated libgphoto2 + * Mon Jul 29 2013 Francois Andriot <[email protected]> - 2:0.9.6-1 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec index 6803cf68a..52e0369da 100644 --- a/redhat/applications/koffice/koffice-14.0.0.spec +++ b/redhat/applications/koffice/koffice-14.0.0.spec @@ -177,7 +177,7 @@ BuildRequires: Mesa-libGLU-devel # OPENJPEG %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}openjpeg-devel +#BuildRequires: %{_lib}openjpeg-devel %endif # LIBXI support diff --git a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec index e17320149..8193e5b10 100644 --- a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec +++ b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec @@ -79,6 +79,7 @@ Requires: %{name}-backends = %{version}-%{release} # POWERMANAGER support (requires HAL) #define with_powermanager 1 +Obsoletes: trinity-tde-guidance-powermanager Obsoletes: trinity-guidance < %{version}-%{release} Provides: trinity-guidance = %{version}-%{release} diff --git a/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec b/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec index d0d2c3112..8c50b6a0e 100644 --- a/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec +++ b/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec @@ -66,8 +66,6 @@ most server implementations. %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - %configure \ --prefix=%{tde_prefix} \ @@ -75,6 +73,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --bindir=%{tde_bindir} \ --libdir=%{tde_libdir} \ --datadir=%{tde_datadir} \ + --includedir=%{tde_tdeincludedir} \ \ --disable-dependency-tracking \ --disable-debug \ diff --git a/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec b/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec index 5ff803701..c71b4093b 100644 --- a/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec +++ b/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec @@ -74,6 +74,7 @@ export PATH="%{tde_bindir}:${PATH}" --bindir=%{tde_bindir} \ --libdir=%{tde_libdir} \ --datadir=%{tde_datadir} \ + --includedir=%{tde_tdeincludedir} \ \ --disable-dependency-tracking \ --disable-debug \ @@ -83,7 +84,7 @@ export PATH="%{tde_bindir}:${PATH}" --enable-rpath \ --disable-gcc-hidden-visibility \ \ -%if 0%{?fedora} >= 20 || 0%{?pclinuxos} || 0%{?rhel} >= 7 +%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7 --with-sword-dir=%{tde_prefix} %endif |