rpms/gnome-screensaver/devel gnome-screensaver.spec,1.103,1.104

[fedora-cvs-commits at redhat.com]

Author: nphilipp

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

Modified Files:
	gnome-screensaver.spec 
Log Message:
remove xscreensaver migration cruft (preun script and triggers, #204944)



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- gnome-screensaver.spec	5 Sep 2006 05:13:05 -0000	1.103
+++ gnome-screensaver.spec	5 Sep 2006 20:53:36 -0000	1.104
@@ -13,7 +13,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.16.0
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 License: GPL
 Group: Amusements/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -52,6 +52,7 @@
 Requires: redhat-menus >= %{redhat_menus_version}
 Requires: system-logos
 Requires: /usr/share/gnome-screensaver/lock-dialog-system.glade
+Conflicts: xscreensaver < 1:5.00-19
 
 %description
 gnome-screensaver is a screen saver and locker that aims to have
@@ -87,14 +88,6 @@
 # hide xscreensaver from the menus
 install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/preferences-post-merged/gnome-screensaver-hide-xscreensaver.menu
 
-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
 
@@ -108,32 +101,6 @@
   gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gnome-screensaver.schemas >/dev/null
 fi
 
-if rpm -q xscreensaver-extras >& /dev/null || \
-   rpm -q xscreensaver-gl-extras >& /dev/null; then
-(cd %{_datadir}/applications/screensavers; \
-for f in %{_datadir}/xscreensaver/config/*.xml; do
-  %{_libexecdir}/gnome-screensaver/migrate-xscreensaver-config.sh $f > /dev/null 2>&1
-done)
-fi
-
-%triggerin -- xscreensaver-extras xscreensaver-gl-extras
-(cd %{_datadir}/applications/screensavers; \
-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}/applications/screensavers; \
-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}/applications/screensavers; \
-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
@@ -152,6 +119,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Tue Sep 05 2006 Nils Philippsen <nphilipp at redhat.com> - 2.16.0-2.fc6
+- remove xscreensaver migration cruft (preun script and triggers, #204944)
+
 * Tue Sep  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0-1.fc6
 - Update to 2.16.0
 - Drop obsolete patch