rpms/redhat-menus/devel redhat-menus-no-submenus.patch, NONE, 1.1 redhat-menus.spec, 1.100, 1.101 categories.patch, 1.5, NONE redhat-menus-7.8.11-evolution.patch, 1.2, NONE redhat-menus-7.8.9-cc-shell.patch, 1.4, NONE redhat-menus-8.9.10-hide-screensavers.patch, 1.1, NONE

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/redhat-menus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2075

Modified Files:
	redhat-menus.spec 
Added Files:
	redhat-menus-no-submenus.patch 
Removed Files:
	categories.patch redhat-menus-7.8.11-evolution.patch 
	redhat-menus-7.8.9-cc-shell.patch 
	redhat-menus-8.9.10-hide-screensavers.patch 
Log Message:
Remove Preferences submenus


redhat-menus-no-submenus.patch:

--- NEW FILE redhat-menus-no-submenus.patch ---
diff -up redhat-menus-10.0.1/menus/preferences.menu.no-submenus redhat-menus-10.0.1/menus/preferences.menu
--- redhat-menus-10.0.1/menus/preferences.menu.no-submenus	2009-02-06 13:21:48.000000000 -0500
+++ redhat-menus-10.0.1/menus/preferences.menu	2009-02-06 13:21:55.000000000 -0500
@@ -12,29 +12,12 @@
   <!-- Read in overrides and child menus from preferences-merged/ -->
   <DefaultMergeDirs/>
 
-  <!-- Sort the control center categories -->
-  <Layout>
-    <Menuname>Personal</Menuname>
-    <Menuname>Look and Feel</Menuname>
-    <Menuname>Internet and Network</Menuname>
-    <Menuname>Hardware</Menuname>
-    <Menuname>System</Menuname>
-    <Merge type="all" />
-  </Layout>
-  
   <!-- Stuff in the toplevel -->
   <Include>
     <And>
       <Category>Settings</Category>
       <Not>
-        <Or>
-          <Category>System</Category>
-          <Category>DesktopSettings</Category>
-          <Category>HardwareSettings</Category>
-          <Category>X-GNOME-PersonalSettings</Category>
-          <Category>X-GNOME-NetworkSettings</Category>
-          <Category>X-GNOME-SystemSettings</Category>
-        </Or>
+        <Category>System</Category>
       </Not>
     </And>
   </Include>
@@ -44,69 +27,4 @@
     <Filename>gnomecc.desktop</Filename>
   </Exclude>
 
-  <!-- Personal submenu -->
-  <Menu>
-    <Name>Personal</Name>
-    <Directory>Personal.directory</Directory>
-    <Include>
-      <And>
-        <Category>Settings</Category>
-        <Category>X-GNOME-PersonalSettings</Category>
-        <Not><Category>System</Category></Not>
-      </And>
-    </Include>
-  </Menu> <!-- End Personal -->
-
-  <!-- Look and Feel submenu -->
-  <Menu>
-    <Name>Look and Feel</Name>
-    <Directory>LookAndFeel.directory</Directory>
-    <Include>
-      <And>
-        <Category>Settings</Category>
-        <Category>DesktopSettings</Category>
-        <Not><Category>System</Category></Not>
-      </And>
-    </Include>
-  </Menu> <!-- End Look and Feel -->
-
-  <!-- Internet and Network submenu -->
-  <Menu>
-    <Name>Internet and Network</Name>
-    <Directory>InternetAndNetwork.directory</Directory>
-    <Include>
-      <And>
-        <Category>Settings</Category>
-        <Category>X-GNOME-NetworkSettings</Category>
-        <Not><Category>System</Category></Not>
-      </And>
-    </Include>
-  </Menu> <!-- End Internet and Network -->
-  
-  <!-- Hardware submenu -->
-  <Menu>
-    <Name>Hardware</Name>
-    <Directory>Hardware.directory</Directory>
-    <Include>
-      <And>
-        <Category>Settings</Category>
-        <Category>HardwareSettings</Category>
-        <Not><Category>System</Category></Not>
-      </And>
-    </Include>
-  </Menu> <!-- End Hardware -->
-
-  <!-- System submenu -->
-  <Menu>
-    <Name>System</Name>
-    <Directory>System.directory</Directory>
-    <Include>
-      <And>
-        <Category>Settings</Category>
-        <Category>X-GNOME-SystemSettings</Category>
-        <Not><Category>System</Category></Not>
-      </And>
-    </Include>
-  </Menu> <!-- End System -->
-
 </Menu>     <!-- End Prefs -->


Index: redhat-menus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-menus/devel/redhat-menus.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- redhat-menus.spec	10 Nov 2008 18:40:01 -0000	1.100
+++ redhat-menus.spec	6 Feb 2009 18:24:23 -0000	1.101
@@ -4,7 +4,7 @@
 Summary: Configuration and data files for the desktop menus
 Name: redhat-menus
 Version: 10.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 License: GPL+
@@ -31,6 +31,7 @@
 Patch2: redhat-menus-8.9.11-directory-rename.patch
 Patch3: icon-names.patch
 Patch4: nono.patch
+Patch5: redhat-menus-no-submenus.patch
 
 %description
 
@@ -45,6 +46,7 @@
 %patch2 -p1 -b .directory-rename
 %patch3 -p1 -b .icon-names
 %patch4 -p1 -b .nono
+%patch5 -p1 -b .no-submenus
 
 %build
 intltoolize --force
@@ -90,6 +92,9 @@
 %{_datadir}/desktop-directories/*.directory
 
 %changelog
+* Fri Feb  6 2009 Matthias Clasen <mclasen at redhat.com> - 10.0.1-2
+- Remove the submenus from Preferences
+
 * Mon Nov 10 2008 Ray Strode <rstrode at redhat.com> - 10.0.1-1
 - Update translations (bug 470652)
 


--- categories.patch DELETED ---


--- redhat-menus-7.8.11-evolution.patch DELETED ---


--- redhat-menus-7.8.9-cc-shell.patch DELETED ---


--- redhat-menus-8.9.10-hide-screensavers.patch DELETED ---