rpms/rss-glx/devel rss-glx.spec,1.8,1.9

[Nils Philippsen (nphilipp)]

Author: nphilipp

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

Modified Files:
	rss-glx.spec 
Log Message:
build xscreensaver hack description files (#200881)
require %{bindir}/kxsconfig (#219106)
Resolves: #219106



Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/rss-glx.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rss-glx.spec	28 Aug 2006 13:54:50 -0000	1.8
+++ rss-glx.spec	14 Jun 2007 07:05:14 -0000	1.9
@@ -1,4 +1,5 @@
 %define xssconfigdir %{_datadir}/xscreensaver/config
+%define xssexthacksconfdir %{_sysconfdir}/xscreensaver/hacks.d
 %define xssbindir %{_libexecdir}/xscreensaver
 %define gssbindir %{_libexecdir}/gnome-screensaver
 %define kdessconfigdir %{_datadir}/applnk/System/ScreenSavers
@@ -29,7 +30,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.8.1%{patchext}
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -99,6 +100,7 @@
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: %{name}-xscreensaver = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdebase
+Requires: %{_bindir}/kxsconfig
 
 %description kde
 A port of the Really Slick Screensavers to GLX. Provides several visually
@@ -175,7 +177,14 @@
         awk '{if ($0 ~ "^Actions=") { print "Actions=InWindow;Root;Setup;"; print "X-KDE-Category=Really Slick Screensavers"; print "X-KDE-Type=OpenGL"; } else { print; }}' < "${trycmd}.desktop.orig" > "${trycmd}.desktop"
         rm -f "${trycmd}.desktop.orig"
         popd >& /dev/null
-        # symlinks for XScreenSaver
+        # external hacks description and symlinks for XScreenSaver
+        cat << EOF >> %{buildroot}%{xssexthacksconfdir}/rss-glx.conf
+name ${name}
+    command ${cmd} -r
+    enabled
+    visuals GL
+
+EOF
 		ln -snf "%{_bindir}/${trycmd}" "%{buildroot}%{xssbindir}/${trycmd}"
 	done
 }
@@ -188,6 +197,7 @@
 mkdir -p %{buildroot}%{_gssconfigdir}
 mkdir -p %{buildroot}%{gssbindir}
 mkdir -p %{buildroot}%{xssbindir}
+mkdir -p %{buildroot}%{xssexthacksconfdir}
 %endif
 cat << EOF | generate_fix_desktop_files_links
 BioF§biof§This is an attempt to recreate some of the work of William Latham.
@@ -217,6 +227,16 @@
 %clean
 rm -rf %buildroot
 
+%post xscreensaver
+if [ -x %{_bindir}/update-xscreensaver-hacks ]; then
+    %{_bindir}/update-xscreensaver-hacks
+fi
+
+%postun xscreensaver
+if [ -x %{_bindir}/update-xscreensaver-hacks ]; then
+    %{_bindir}/update-xscreensaver-hacks
+fi
+
 %files
 %defattr(-, root, root)
 %doc ChangeLog COPYING INSTALL README README.xscreensaver
@@ -226,6 +246,8 @@
 
 %files xscreensaver
 %defattr(-, root, root)
+%dir %{xssexthacksconfdir}
+%config(noreplace) %{xssexthacksconfdir}/rss-glx.conf
 %{xssconfigdir}/*.xml
 %dir %{xssbindir}
 %{xssbindir}/*
@@ -245,6 +267,10 @@
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* 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)
+
 * Mon Aug 28 2006 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-6
 - FC6 mass rebuild