rpms/gnome-screensaver/F-11 gnome-screensaver-hide-xscreensaver.menu, 1.2, 1.3 gnome-screensaver.spec, 1.210, 1.211

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2293

Modified Files:
	gnome-screensaver-hide-xscreensaver.menu 
	gnome-screensaver.spec 
Log Message:
Fix the 'hide xscreensaver' hack



Index: gnome-screensaver-hide-xscreensaver.menu
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/F-11/gnome-screensaver-hide-xscreensaver.menu,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gnome-screensaver-hide-xscreensaver.menu	21 Sep 2007 15:59:06 -0000	1.2
+++ gnome-screensaver-hide-xscreensaver.menu	29 Apr 2009 15:52:29 -0000	1.3
@@ -1,12 +1,15 @@
 <Menu>
+<!-- We have to exclude xscreensaver in two places, since the menu 
+     hierarchy changes when you install the preferences-menus package
+ -->
 <Name>Preferences</Name>
+  <Exclude>
+    <Filename>xscreensaver-properties.desktop</Filename>
+  </Exclude>
   <Menu>
     <Name>Look and Feel</Name>
     <Exclude>
-      <Filename>screensaver-properties.desktop</Filename>
-    </Exclude>
-    <Exclude>
-      <Filename>gnome-screensaver-properties.desktop</Filename>
+      <Filename>xscreensaver-properties.desktop</Filename>
     </Exclude>
   </Menu>
 </Menu>


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/F-11/gnome-screensaver.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -p -r1.210 -r1.211
--- gnome-screensaver.spec	14 Apr 2009 02:50:24 -0000	1.210
+++ gnome-screensaver.spec	29 Apr 2009 15:52:29 -0000	1.211
@@ -14,7 +14,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.26.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.26/%{name}-%{version}.tar.bz2
@@ -146,6 +146,10 @@ fi
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Wed Apr 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-2
+- Update the 'hide xscreensaver' hack to work with current
+  packages and menus  (#455951)
+
 * Mon Apr 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-1
 - Update to 2.26.1
 - See http://download.gnome.org/sources/gnome-screensaver/2.26/gnome-screensaver-2.26.1.news