Branch: master

38dc3bd9 2014-12-09 14:30:59 François Andriot
RPM packaging: update tdeutils
M redhat/main/tdeutils/tdeutils-14.0.0.spec
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 @@
 # 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 @@
 %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