summaryrefslogtreecommitdiffstats
path: root/redhat/main/tdepim/tdepim-14.0.0.spec
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2015-08-05 20:25:18 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2015-08-05 20:25:18 +0200
commit562049cd694f6dd0927b9880227fc4f6da008839 (patch)
treee939e442f1fb29ff29811ebc02f672ecf62a47c1 /redhat/main/tdepim/tdepim-14.0.0.spec
parent6253ed4f8177cb33fef709fb7e215ff94e6300c1 (diff)
downloadtde-packaging-562049cd694f6dd0927b9880227fc4f6da008839.tar.gz
tde-packaging-562049cd694f6dd0927b9880227fc4f6da008839.zip
RPM Packaging: massive update
Diffstat (limited to 'redhat/main/tdepim/tdepim-14.0.0.spec')
-rw-r--r--redhat/main/tdepim/tdepim-14.0.0.spec55
1 files changed, 33 insertions, 22 deletions
diff --git a/redhat/main/tdepim/tdepim-14.0.0.spec b/redhat/main/tdepim/tdepim-14.0.0.spec
index e1325e0a2..333790f53 100644
--- a/redhat/main/tdepim/tdepim-14.0.0.spec
+++ b/redhat/main/tdepim/tdepim-14.0.0.spec
@@ -73,9 +73,6 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-%if 0%{?rhel} == 5
-Patch0: %{tde_pkg}-%{version}.patch
-%endif
BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@@ -114,15 +111,13 @@ BuildRequires: brp-check-trinity
BuildRequires: gamin-devel
%endif
-# CURL support
+# FLEX support
%if 0%{?fedora} >= 15
BuildRequires: flex-static
%endif
-%if 0%{?rhel} > 0 && 0%{?rhel} <= 5
-BuildRequires: trinity-libcurl-devel
-%else
+
+# CURL support
BuildRequires: curl-devel
-%endif
# GLIB2 support
BuildRequires: glib2-devel
@@ -147,28 +142,47 @@ BuildRequires: libXcomposite-devel
%endif
# XSCREENSAVER support
-# Disabled on RHEL4
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
+# RHEL 4: disabled
+# RHEL 6: available in EPEL
+# RHEL 7: available in NUX
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_xscreensaver 1
-%if 0%{?rhel} == 5
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: gnome-screensaver
+
+%if 0%{?fedora} || 0%{?rhel} >= 5
+BuildRequires: libXScrnSaver-devel
+BuildRequires: xscreensaver
+BuildRequires: xscreensaver-base
+BuildRequires: xscreensaver-extras
+%if 0%{?fedora}
+BuildRequires: xscreensaver-extras-base
%endif
+BuildRequires: xscreensaver-gl-base
+BuildRequires: xscreensaver-gl-extras
+%endif
+
+%if 0%{?suse_version}
+BuildRequires: libXScrnSaver-devel
+BuildRequires: xscreensaver
+BuildRequires: xscreensaver-data
+BuildRequires: xscreensaver-data-extra
+%endif
+
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} >= 4
BuildRequires: %{_lib}xscrnsaver-devel
%else
BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
%endif
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220
-BuildRequires: libXScrnSaver-devel
-%endif
-%if 0%{?suse_version} == 1140
BuildRequires: xscreensaver
+BuildRequires: xscreensaver-base
+BuildRequires: xscreensaver-extrusion
+BuildRequires: xscreensaver-gl
%endif
%endif
+# ACL support
+BuildRequires: libacl-devel
+
Requires: trinity-libtdepim = %{version}-%{release}
Requires: %{name}-kfile-plugins = %{version}-%{release}
@@ -339,7 +353,7 @@ Requires: trinity-akregator = %{version}-%{release}
%package -n trinity-kaddressbook
Summary: TDE addressbook application
Group: Applications/Communications
-Requires: trinity-kdebase-pim-ioslaves
+Requires: trinity-tdebase-pim-ioslaves
Requires: %{name}-tderesources = %{version}-%{release}
%description -n trinity-kaddressbook
@@ -2277,9 +2291,6 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%if 0%{?rhel} == 5
-%patch0 -p1
-%endif
%build