From 28af76e07607eaaf9d7606c4c4e532a83f793c5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 29 Jul 2014 21:51:45 +0200 Subject: [PATCH] RPM packaging: update R14 packages --- redhat/applications/bibletime/bibletime-14.0.0.spec | 6 +----- redhat/applications/kpilot/kpilot-14.0.0.spec | 1 + .../tdeio-sword/tdeio-sword-14.0.0.spec | 2 +- .../libraries/libksquirrel/libksquirrel-14.0.0.spec | 2 +- .../tdeaccessibility/tdeaccessibility-14.0.0.spec | 7 ------- redhat/tdeaddons/tdeaddons-14.0.0.spec | 7 +++---- redhat/tdeartwork/tdeartwork-14.0.0.spec | 13 ++++++++----- 7 files changed, 15 insertions(+), 23 deletions(-) diff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime-14.0.0.spec index 62ef360a5..02b0f8a64 100644 --- a/redhat/applications/bibletime/bibletime-14.0.0.spec +++ b/redhat/applications/bibletime/bibletime-14.0.0.spec @@ -53,11 +53,7 @@ BuildRequires: gettext BuildRequires: clucene-core-devel %endif %if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} BuildRequires: %{_lib}clucene-devel -%else -BuildRequires: %{_lib}clucene-devel -%endif %endif # Requires: sword @@ -106,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} +%if 0%{?fedora} >= 20 || 0%{?pclinuxos} || 0%{?rhel} >= 7 --with-sword-dir=%{tde_prefix} %endif diff --git a/redhat/applications/kpilot/kpilot-14.0.0.spec b/redhat/applications/kpilot/kpilot-14.0.0.spec index f7557a3fd..cf3f4dd3e 100644 --- a/redhat/applications/kpilot/kpilot-14.0.0.spec +++ b/redhat/applications/kpilot/kpilot-14.0.0.spec @@ -48,6 +48,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils +BuildRequires: flex-devel BuildRequires: gettext BuildRequires: pilot-link-devel >= 0.12 BuildRequires: trinity-tdepim-devel >= %{tde_version} 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 d1e1f428e..5ff803701 100644 --- a/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec +++ b/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec @@ -83,7 +83,7 @@ export PATH="%{tde_bindir}:${PATH}" --enable-rpath \ --disable-gcc-hidden-visibility \ \ -%if 0%{?fedora} >= 20 || 0%{?pclinuxos} +%if 0%{?fedora} >= 20 || 0%{?pclinuxos} || 0%{?rhel} >= 7 --with-sword-dir=%{tde_prefix} %endif diff --git a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec index 48a4b275e..aa21945b0 100644 --- a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec +++ b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec @@ -79,7 +79,7 @@ BuildRequires: xmedcon-devel %if 0%{?fedora} || 0%{?rhel} BuildRequires: librsvg2 %endif -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: librsvg2-tools %endif %if 0%{?mgaversion} || 0%{?mdkversion} diff --git a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec index aef25b196..cdacd64a6 100644 --- a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec +++ b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec @@ -84,13 +84,6 @@ BuildRequires: libXau-devel BuildRequires: xorg-x11-devel %endif -# Broken PNG images -%if 0%{?mgaversion} >= 4 || 0%{?fedora} >= 20 -BuildRequires: kde-dev-scripts -BuildRequires: optipng -BuildRequires: advancecomp -%endif - Obsoletes: trinity-kdeaccessibility < %{version}-%{release} Provides: trinity-kdeaccessibility = %{version}-%{release} Obsoletes: trinity-kdeaccessibility-libs < %{version}-%{release} diff --git a/redhat/tdeaddons/tdeaddons-14.0.0.spec b/redhat/tdeaddons/tdeaddons-14.0.0.spec index 40270cfc7..2ac162ece 100644 --- a/redhat/tdeaddons/tdeaddons-14.0.0.spec +++ b/redhat/tdeaddons/tdeaddons-14.0.0.spec @@ -65,14 +65,14 @@ BuildRequires: db4-devel BuildRequires: db5-devel %endif %endif -%if 0%{?fedora} >= 18 +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 BuildRequires: libdb-devel BuildRequires: libdb-cxx-devel %endif %if 0%{?suse_version} BuildRequires: libdb-4_8-devel %endif -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} <= 6 BuildRequires: db4-devel %endif %endif @@ -391,7 +391,7 @@ Requires: %{_lib}jpeg8 %if 0%{?rhel} || 0%{?fedora} Requires: libjpeg %endif -%if 0%{?suse_version} >= 1220 +%if 0%{?suse_version} == 1220 Requires: libjpeg62 %endif %if 0%{?pclinuxos} @@ -670,7 +670,6 @@ done ########## - %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} diff --git a/redhat/tdeartwork/tdeartwork-14.0.0.spec b/redhat/tdeartwork/tdeartwork-14.0.0.spec index 78ee69cfc..e8c812144 100644 --- a/redhat/tdeartwork/tdeartwork-14.0.0.spec +++ b/redhat/tdeartwork/tdeartwork-14.0.0.spec @@ -60,6 +60,7 @@ BuildRequires: trinity-libart-lgpl-devel # XSCREENSAVER support %if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} +%if 0%{?rhel} == 0 || 0%{?rhel} <= 6 %define with_xscreensaver 1 %if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} >= 4 @@ -92,6 +93,7 @@ BuildRequires: xscreensaver-data-extra %define with_webcollage 1 %endif +%endif %endif # JACK support @@ -431,6 +433,11 @@ This package is part of Trinity, and a component of the TDE artwork module. %{tde_datadir}/applnk/System/ScreenSavers/photopile.desktop %{tde_datadir}/applnk/System/ScreenSavers/skytentacles.desktop +# These screensavers do not exist on Mageia 2 +%if 0%{?mgaversion} == 0 && 0%{?mdkversion} == 0 +%{tde_datadir}/applnk/System/ScreenSavers/glmatrix.desktop +%endif + ########## %if 0%{?with_webcollage} @@ -456,10 +463,6 @@ you might find inappropriate and offensive. You are specially discouraged to install this package if you are using your computer in a working environment or in an environment with children. -If you still want to install this package, please read the file -/usr/share/doc/tdescreensaver-xsavers-webcollage/README.Debian after the -installation. - This package is part of Trinity, and a component of the TDE artwork module. %files -n trinity-tdescreensaver-xsavers-webcollage @@ -629,7 +632,7 @@ This package is part of Trinity, and a component of the TDE artwork module. %{tde_datadir}/applnk/System/ScreenSavers/xmatrix.desktop %endif -%if 0%{?rhel} == 6 +%if 0%{?rhel} >= 6 %{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop %{tde_datadir}/applnk/System/ScreenSavers/surfaces.desktop %endif