rpms/rss-glx/devel rss-glx.spec,1.11,1.12

[Nils Philippsen (nphilipp)]

Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28867

Modified Files:
	rss-glx.spec 
Log Message:
implement revamped modular xscreensaver configuration (#200881)
require post/preun xscreensaver-base min/max EVR
don't let %preun fail



Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/rss-glx.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rss-glx.spec	29 Aug 2007 14:54:53 -0000	1.11
+++ rss-glx.spec	3 Sep 2007 12:37:14 -0000	1.12
@@ -17,9 +17,15 @@
 %else
 %define _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
 %endif
+%if "%{fedora}" >= "8"
+%define modular_xss 0%{?!_without_modular_xss:1}
+%else
+%define modular_xss 0%{?_with_modular_xss:1}
+%endif
 %endif
 %else
 %define modular_x 0%{?!_without_modular_x:1}
+%define modular_xss 0%{?!_without_modular_xss:1}
 %define gss 0%{?!_without_gss:1}
 %define _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
 %endif
@@ -30,7 +36,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.8.1%{patchext}
-Release: 9%{?dist}
+Release: 9.1%{?dist}
 License: GPL
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -43,11 +49,11 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
-%if %modular_x
-BuildRequires: libICE-devel
 %if %with_matrixview
 BuildRequires: ImageMagick-devel >= 6.2.5.4
 %endif
+%if %modular_x
+BuildRequires: libICE-devel
 BuildRequires: libSM-devel
 BuildRequires: libX11-devel
 BuildRequires: libXt-devel
@@ -73,7 +79,12 @@
 Summary: Really Slick Screensavers
 Group: Amusements/Graphics
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: xscreensaver-base
+%if %modular_xss
+Requires(post): xscreensaver-base >= 1:5.03-2
+Requires(preun): xscreensaver-base >= 1:5.03-2
+%else
+Requires: xscreensaver-base < 1:5.03-2
+%endif
 
 %description xscreensaver
 A port of the Really Slick Screensavers to GLX. Provides several visually
@@ -180,11 +191,8 @@
         popd >& /dev/null
         # external hacks description and symlinks for XScreenSaver
         cat << EOF >> %{buildroot}%{xssexthacksconfdir}/rss-glx.conf
-name ${name}
-    command ${cmd} -r
-    enabled
-    visuals GL
-
+GL:     "${name}" \\
+        ${cmd} -r \\n\\
 EOF
 		ln -snf "%{_bindir}/${trycmd}" "%{buildroot}%{xssbindir}/${trycmd}"
 	done
@@ -233,9 +241,9 @@
     %{_bindir}/update-xscreensaver-hacks
 fi
 
-%postun xscreensaver
+%preun xscreensaver
 if [ -x %{_bindir}/update-xscreensaver-hacks ]; then
-    %{_bindir}/update-xscreensaver-hacks
+    %{_bindir}/update-xscreensaver-hacks || :
 fi
 
 %files
@@ -247,7 +255,7 @@
 
 %files xscreensaver
 %defattr(-, root, root)
-%dir %{xssexthacksconfdir}
+# xscreensaver-base provides %{xssexthacksconfdir}
 %config(noreplace) %{xssexthacksconfdir}/rss-glx.conf
 %{xssconfigdir}/*.xml
 %dir %{xssbindir}
@@ -268,6 +276,11 @@
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Mon Sep 03 2007 Nils Philippsen <nphilipp at redhat.com>
+- implement revamped modular xscreensaver configuration (#200881)
+- require post/preun xscreensaver-base min/max EVR
+- don't let %%preun fail
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.8.1.p-9
 - Buildrequire gawk.