summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFran├žois Andriot <albator78@libertysurf.fr>2014-12-09 21:30:59 +0100
committerFran├žois Andriot <albator78@libertysurf.fr>2014-12-09 21:30:59 +0100
commit38dc3bd9eeb0efc33a7e77503a60a8c7bb5cf248 (patch)
tree62bf609dd709edf96546298b1e6a826242ea8b05
parented1ce801c3d2b226c80aa5a014e1b244c7374d80 (diff)
downloadtde-packaging-38dc3bd9eeb0efc33a7e77503a60a8c7bb5cf248.zip
tde-packaging-38dc3bd9eeb0efc33a7e77503a60a8c7bb5cf248.tar.gz
RPM packaging: update tdeutils
-rw-r--r--redhat/main/tdeutils/tdeutils-14.0.0.spec18
1 files changed, 12 insertions, 6 deletions
diff --git a/redhat/main/tdeutils/tdeutils-14.0.0.spec b/redhat/main/tdeutils/tdeutils-14.0.0.spec
index eaf8167..2571325 100644
--- a/redhat/main/tdeutils/tdeutils-14.0.0.spec
+++ b/redhat/main/tdeutils/tdeutils-14.0.0.spec
@@ -118,10 +118,7 @@ BuildRequires: gamin-devel
# PCRE support
BuildRequires: pcre-devel
-%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5
-BuildRequires: libXScrnSaver-devel
-%endif
-
+# XMMS support
#%if 0%{?fedora}
#BuildRequires: xmms-devel
#%endif
@@ -133,9 +130,18 @@ BuildRequires: libXScrnSaver-devel
%endif
# XSCREENSAVER support
-# Not for RHEL 4!
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?with_xscreensaver}
%define with_xscreensaver 1
+%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version}
+BuildRequires: libXScrnSaver-devel
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires: %{_lib}xscrnsaver-devel
+%else
+BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
+%endif
+%endif
%endif
# CONSOLEHELPER (usermode) support