rpms/gnome-screensaver/FC-5 gnome-screensaver.spec,1.70,1.71

[fedora-cvs-commits at redhat.com]

Author: nphilipp

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

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



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/FC-5/gnome-screensaver.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- gnome-screensaver.spec	2 Aug 2006 13:49:40 -0000	1.70
+++ gnome-screensaver.spec	5 Sep 2006 21:01:01 -0000	1.71
@@ -13,7 +13,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.14.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -58,6 +58,8 @@
 Requires: redhat-menus >= %{redhat_menus_version}
 Requires: system-logos
 
+Conflicts: xscreensaver < 4.24-3
+
 %description
 gnome-screensaver is a screen saver and locker that aims to have
 simple, sane, secure defaults and be well integrated with the desktop.
@@ -101,14 +103,6 @@
 
 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
-
 rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-logo-white.svg
 install -D -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-logo-white.svg
 
@@ -123,32 +117,6 @@
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null
 done
 
-if rpm -q xscreensaver-extras >& /dev/null || \
-   rpm -q xscreensaver-gl-extras >& /dev/null; then
-(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)
-fi
-
-%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
@@ -166,6 +134,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Tue Sep 05 2006 Nils Philippsen <nphilipp at redhat.com> - 2.14.3-1.fc5
+- remove xscreensaver migration cruft (post script and triggers, #204944)
+
 * Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-1.fc5
 - Update to 2.14.3