From 245a8361c1e35fdce2b3f8fc7fbc9701aab41618 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Apr 29 2009 15:52:29 +0000
Subject: Fix the 'hide xscreensaver' hack


---

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 970cc72..d9a393e 100644
--- a/gnome-screensaver.spec
+++ b/gnome-screensaver.spec
@@ -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@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@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