[gnome-screensaver/f14/master] - Really hide xscreensaver properties from the menus when gnome-screensaver is installed (#530318)

[Bastien Nocera]

commit 5cce139ff61f85865b9e9efe39a9b440275e270a
Author: Bastien Nocera <hadess at hadess.net>
Date:   Wed Oct 13 12:12:57 2010 +0100

    - Really hide xscreensaver properties from the menus when
      gnome-screensaver is installed (#530318)

 gnome-screensaver-hide-xscreensaver.menu |   11 +++++++----
 gnome-screensaver.spec                   |    6 +++++-
 2 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/gnome-screensaver-hide-xscreensaver.menu b/gnome-screensaver-hide-xscreensaver.menu
index 1f9f393..0260cf3 100644
--- a/gnome-screensaver-hide-xscreensaver.menu
+++ b/gnome-screensaver-hide-xscreensaver.menu
@@ -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>
diff --git a/gnome-screensaver.spec b/gnome-screensaver.spec
index b81d546..f3406d5 100644
--- a/gnome-screensaver.spec
+++ b/gnome-screensaver.spec
@@ -14,7 +14,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.30.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
 #VCS: git:git://git.gnome.org/gnome-screensaver
@@ -135,6 +135,10 @@ fi
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Wed Oct 13 2010 Bastien Nocera <bnocera at redhat.com> 2.30.2-2
+- Really hide xscreensaver properties from the menus when
+  gnome-screensaver is installed (#530318)
+
 * Wed Sep 29 2010 Matthias Clasen <mclasen at redhat.com> - 2.30.2-1
 - Update to 2.30.2