rpms/rss-glx/devel rss-glx.spec,1.13,1.14

[Nils Philippsen (nphilipp)]

Author: nphilipp

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

Modified Files:
	rss-glx.spec 
Log Message:
replace requirement on %{_bindir}/kxsconfig by kdeartwork-kxe (Fedora >= 7, RHEL >= 6), kdeartwork-extras (<= Fedora 6, RHEL 5)
license is GPLv2
run %{_sbindir}/update-xscreensaver-hacks in %%post, %%postun, require xscreensaver-base >= 5.03-3 for that
don't reference upstream URL for source tarball as we ship a modified one



Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/rss-glx.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rss-glx.spec	3 Sep 2007 14:35:48 -0000	1.13
+++ rss-glx.spec	14 Sep 2007 22:45:06 -0000	1.14
@@ -36,11 +36,14 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.8.1%{patchext}
-Release: 9.1%{?dist}
-License: GPL
+Release: 10%{?dist}
+License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
-Source0: http://dl.sourceforge.net/sourceforge/rss-glx/rss-glx_%{version}.tar.bz2
+# We ship a tarball with one questionable hack patched out.
+# The original URL is the following without %%patchext:
+# Source0: http://dl.sourceforge.net/sourceforge/rss-glx/rss-glx_%{version}.tar.bz2
+Source0: rss-glx_%{version}.tar.bz2
 Source1: README.fedora
 Source2: rss-glx-rm-matrixview.sh
 Source3: rss-glx-0.8.1-0.8.1.p.diff
@@ -80,10 +83,10 @@
 Group: Amusements/Graphics
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %if %modular_xss
-Requires(post): xscreensaver-base >= 1:5.03-2
-Requires(preun): xscreensaver-base >= 1:5.03-2
+Requires(post): xscreensaver-base >= 1:5.03-3
+Requires(postun): xscreensaver-base >= 1:5.03-3
 %else
-Requires: xscreensaver-base < 1:5.03-2
+Requires: xscreensaver-base < 1:5.03-3
 %endif
 
 %description xscreensaver
@@ -112,7 +115,11 @@
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: %{name}-xscreensaver = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdebase
-Requires: %{_bindir}/kxsconfig
+%if 0%{?fedora}%{?rhel} > 0 && 0%{?fedora} <= 6 && 0%{?rhel} <= 5
+Requires: kdeartwork-extras
+%else
+Requires: kdeartwork-kxs
+%endif
 
 %description kde
 A port of the Really Slick Screensavers to GLX. Provides several visually
@@ -237,13 +244,13 @@
 rm -rf %buildroot
 
 %post xscreensaver
-if [ -x %{_bindir}/update-xscreensaver-hacks ]; then
-    %{_bindir}/update-xscreensaver-hacks
+if [ -x %{_sbindir}/update-xscreensaver-hacks ]; then
+    %{_sbindir}/update-xscreensaver-hacks
 fi
 
-%preun xscreensaver
-if [ -x %{_bindir}/update-xscreensaver-hacks ]; then
-    %{_bindir}/update-xscreensaver-hacks || :
+%postun xscreensaver
+if [ -x %{_sbindir}/update-xscreensaver-hacks ]; then
+    %{_sbindir}/update-xscreensaver-hacks || :
 fi
 
 %files
@@ -276,6 +283,14 @@
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Fri Sep 14 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-10
+- replace requirement on %{_bindir}/kxsconfig by kdeartwork-kxe (Fedora >= 7,
+  RHEL >= 6), kdeartwork-extras (<= Fedora 6, RHEL 5) 
+- license is GPLv2
+- run %{_sbindir}/update-xscreensaver-hacks in %%post, %%postun, require
+  xscreensaver-base >= 5.03-3 for that
+- don't reference upstream URL for source tarball as we ship a modified one
+
 * Mon Sep 03 2007 Nils Philippsen <nphilipp at redhat.com>
 - implement revamped modular xscreensaver configuration (#200881)
 - require post/preun xscreensaver-base min/max EVR
@@ -289,7 +304,7 @@
 
 * Thu Jun 14 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-7
 - build xscreensaver hack description files (#200881)
-- require %{bindir}/kxsconfig (#219106)
+- require %{_bindir}/kxsconfig (#219106)
 
 * Mon Aug 28 2006 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-6
 - FC6 mass rebuild