--- cauldron/gnome-screensaver/current/SPECS/gnome-screensaver.spec	2011/01/20 18:21:41	26578
+++ cauldron/gnome-screensaver/current/SPECS/gnome-screensaver.spec	2011/01/20 18:21:44	26579
@@ -7,12 +7,6 @@
 Version: %{version}
 Release: %{release}
 Source0: http://ftp.gnome.org/pub/GNOME/sources/%name/%{name}-%{version}.tar.bz2
-Source1: ia-ora-slideshow.desktop
-Source2: ia-ora-blue-slideshow.desktop
-Source3: ia-ora-orange-slideshow.desktop
-Source4: ia-ora-gray-slideshow.desktop
-Source5: ia-ora-free-slideshow.desktop
-Source6: ia-ora-one-slideshow.desktop
 # (fc) 2.15.7-2mdv change default settings
 Patch4: gnome-screensaver-2.15.7-default.patch
 # (vdanen) drops setgid calls to work with tcb auth
@@ -43,7 +37,7 @@
 BuildRequires: desktop-file-utils
 Requires: libxslt-proc
 Requires: dbus-x11
-Suggests: mandriva-theme-screensaver
+Suggests: mageia-theme-screensaver
 
 %description
 gnome-screensaver is a screen saver and locker that aims to have
@@ -75,10 +69,6 @@
 install -m755 data/migrate-xscreensaver-config.sh $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver
 install -m644 data/xscreensaver-config.xsl $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver
 
-install -m644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/applications/screensavers
-
-sed -i -e 's@Exec=slideshow@Exec=%{_libdir}/gnome-screensaver/slideshow@g' $RPM_BUILD_ROOT%{_datadir}/applications/screensavers/ia-ora*.desktop
-
 desktop-file-install --vendor="" \
   --add-category="GTK" \
   --add-category="GNOME" \
@@ -88,17 +78,6 @@
 
 %define schemas %name
 
-# unset default screensaver
-%triggerpostun -- gnome-screensaver < 2.20.0-2mdv
-  %{_bindir}/gconftool-2 --config-source=xml::/etc/gconf/gconf.xml.local-defaults/ --direct --unset /apps/gnome-screensaver/themes > /dev/null
-
-
-%if %mdkversion < 200900
-%post
-%update_menus
-%post_install_gconf_schemas %{schemas}
-%endif
-
 %triggerin -- xscreensaver-base xscreensaver-gl xscreensaver-extrusion xscreensaver-matrix
 (  cd %{_datadir}/applications/screensavers ; \
   for f in %{_datadir}/xscreensaver/config/*.xml; do
@@ -138,11 +117,6 @@
 %preun
 %preun_uninstall_gconf_schemas %{schemas}
 
-%if %mdkversion < 200900
-%postun
-%clean_menus
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT