rpms/redhat-menus/devel redhat-menus-preferences-categories.patch, NONE, 1.1 redhat-menus.spec, 1.102, 1.103

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	redhat-menus.spec 
Added Files:
	redhat-menus-preferences-categories.patch 
Log Message:
Make adding preferences submenus work


redhat-menus-preferences-categories.patch:

--- NEW FILE redhat-menus-preferences-categories.patch ---
diff -up redhat-menus-10.0.1/menus/preferences.menu.categories redhat-menus-10.0.1/menus/preferences.menu
--- redhat-menus-10.0.1/menus/preferences.menu.categories	2009-02-25 00:10:51.612815552 -0500
+++ redhat-menus-10.0.1/menus/preferences.menu	2009-02-25 00:11:06.782816607 -0500
@@ -9,9 +9,6 @@
   <DefaultAppDirs/>
   <DefaultDirectoryDirs/>
 
-  <!-- Read in overrides and child menus from preferences-merged/ -->
-  <DefaultMergeDirs/>
-
   <!-- Stuff in the toplevel -->
   <Include>
     <And>
@@ -27,4 +24,7 @@
     <Filename>gnomecc.desktop</Filename>
   </Exclude>
 
+  <!-- Read in overrides and child menus from preferences-merged/ -->
+  <DefaultMergeDirs/>
+
 </Menu>     <!-- End Prefs -->


Index: redhat-menus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-menus/devel/redhat-menus.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- redhat-menus.spec	6 Feb 2009 18:53:38 -0000	1.102
+++ redhat-menus.spec	25 Feb 2009 05:29:33 -0000	1.103
@@ -4,7 +4,7 @@
 Summary: Configuration and data files for the desktop menus
 Name: redhat-menus
 Version: 10.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 License: GPL+
@@ -31,6 +31,7 @@
 Patch3: icon-names.patch
 Patch4: nono.patch
 Patch5: redhat-menus-no-submenus.patch
+Patch6: redhat-menus-preferences-categories.patch
 
 %description
 
@@ -46,6 +47,7 @@
 %patch3 -p1 -b .icon-names
 %patch4 -p1 -b .nono
 %patch5 -p1 -b .no-submenus
+%patch6 -p1 -b .preferences-categories
 
 %build
 intltoolize --force
@@ -89,6 +91,9 @@
 %{_datadir}/desktop-directories/*.directory
 
 %changelog
+* Wed Feb 25 2009 Matthias Clasen <mclasen at redhat.com> - 10.0.1-3
+- Make adding submenus to Preferences work
+
 * Fri Feb  6 2009 Matthias Clasen <mclasen at redhat.com> - 10.0.1-2
 - Remove the submenus from Preferences