rpms/gnome-screensaver/devel gnome-screensaver.spec,1.50,1.51

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26189

Modified Files:
	gnome-screensaver.spec 
Log Message:
- try to migrate xscreensaver screensavers (bug 172715)



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- gnome-screensaver.spec	31 Jan 2006 04:44:30 -0000	1.50
+++ gnome-screensaver.spec	31 Jan 2006 20:57:54 -0000	1.51
@@ -14,7 +14,7 @@
 Summary: GNOME Sreensaver
 Name: gnome-screensaver
 Version: 2.13.90
-Release: 1
+Release: 2
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -94,6 +94,14 @@
 
 install -D -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver/themes
 
+sed -ie 's at XSL=${DIST_BIN}/xscreensaver-config.xsl at XSL=%{_datadir}/gnome-screensaver/xscreensaver-config.xsl@' \
+        data/migrate-xscreensaver-config.sh
+sed -ie 's at b=`basename ${FILE} .xml`@b=xscreensaver-`basename ${FILE} .xml`@' \
+        data/migrate-xscreensaver-config.sh
+
+install -D -m755 data/migrate-xscreensaver-config.sh $RPM_BUILD_ROOT%{_libexecdir}/gnome-screensaver
+install -D -m644 data/xscreensaver-config.xsl $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -104,6 +112,24 @@
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null
 done
 
+%triggerin -- xscreensaver-extras xscreensaver-gl-extras
+(cd %{_datadir}/gnome-screensaver/themes; \
+for f in %{_datadir}/xscreensaver/config/*.xml; do
+  %{_libexecdir}/gnome-screensaver/migrate-xscreensaver-config.sh $f > /dev/null 2>&1
+done)
+
+%triggerun -- xscreensaver-extras 
+(cd %{_datadir}/gnome-screensaver/themes; \
+for f in $(rpm -ql xscreensaver-extras | grep '%{_datadir}/xscreensaver/config/'); do
+  rm -f xscreensaver-$(basename $f .xml).desktop
+done)
+
+%triggerun -- xscreensaver-gl-extras
+(cd %{_datadir}/gnome-screensaver/themes; \
+for f in $(rpm -ql xscreensaver-gl-extras | grep '%{_datadir}/xscreensaver/config/'); do
+  rm -f xscreensaver-$(basename $f .xml).desktop
+done)
+
 %files -f %{name}.lang
 %defattr(-, root, root)
 %doc AUTHORS ChangeLog NEWS README
@@ -120,6 +146,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Tue Jan 31 2006 Ray Strode <rstrode at redhat.com> - 2.13.90-2
+- try to migrate xscreensaver screensavers (bug 172715)
+
 * Mon Jan 30 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.90-1
 - Update to 2.13.90
 
@@ -217,3 +246,4 @@
 - Initial package 
 
 
+