rpms/gnome-screensaver/devel gnome-screensaver-hide-xscreensaver.menu, 1.1, 1.2 gnome-screensaver.spec, 1.165, 1.166

[Ray Strode (rstrode)]

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13904

Modified Files:
	gnome-screensaver-hide-xscreensaver.menu 
	gnome-screensaver.spec 
Log Message:
- hide xscreensaver menu if gnome-screensaver is installed
  (bug 300401)



Index: gnome-screensaver-hide-xscreensaver.menu
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver-hide-xscreensaver.menu,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-screensaver-hide-xscreensaver.menu	26 Sep 2005 19:08:04 -0000	1.1
+++ gnome-screensaver-hide-xscreensaver.menu	21 Sep 2007 15:59:06 -0000	1.2
@@ -1,9 +1,12 @@
 <Menu>
-  <Name>Preferences</Name>
-  <Exclude>
-    <Filename>screensaver-properties.desktop</Filename>
-  </Exclude>
-  <Exclude>
-    <Filename>gnome-screensaver-properties.desktop</Filename>
-  </Exclude>
+<Name>Preferences</Name>
+  <Menu>
+    <Name>Look and Feel</Name>
+    <Exclude>
+      <Filename>screensaver-properties.desktop</Filename>
+    </Exclude>
+    <Exclude>
+      <Filename>gnome-screensaver-properties.desktop</Filename>
+    </Exclude>
+  </Menu>
 </Menu>


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- gnome-screensaver.spec	20 Sep 2007 21:42:12 -0000	1.165
+++ gnome-screensaver.spec	21 Sep 2007 15:59:06 -0000	1.166
@@ -13,7 +13,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.20.0
-Release: 2%{?dist} 
+Release: 3%{?dist} 
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.20/%{name}-%{version}.tar.bz2
@@ -130,6 +130,10 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Fri Sep 21 2007 Ray Strode <rstrode at redhat.com> - 2.20.0-3
+- hide xscreensaver menu if gnome-screensaver is installed
+  (bug 300401)
+
 * Thu Sep 20 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-2
 - Make the default theme setting work