rpms/redhat-menus/devel categories.patch, 1.1, 1.2 redhat-menus.spec, 1.80, 1.81

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/redhat-menus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24702

Modified Files:
	categories.patch redhat-menus.spec 
Log Message:
Reduce hardcoded apps


categories.patch:

Index: categories.patch
===================================================================
RCS file: /cvs/extras/rpms/redhat-menus/devel/categories.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- categories.patch	27 Jun 2007 05:53:30 -0000	1.1
+++ categories.patch	27 Jun 2007 13:10:01 -0000	1.2
@@ -1,6 +1,6 @@
 --- redhat-menus-8.9.10/menus/applications.menu.categories	2007-06-27 01:37:57.000000000 -0400
-+++ redhat-menus-8.9.10/menus/applications.menu	2007-06-27 01:39:42.000000000 -0400
-@@ -123,10 +123,8 @@
++++ redhat-menus-8.9.10/menus/applications.menu	2007-06-27 09:00:37.000000000 -0400
+@@ -123,21 +123,14 @@
      <Include>
        <And>
          <Category>System</Category>
@@ -12,7 +12,30 @@
        </And>
      </Include>
  
-@@ -167,8 +165,6 @@
+     <Exclude>
+-      <Filename>gdmflexiserver.desktop</Filename>
+-      <Filename>gdmflexiserver-xnest.desktop</Filename>
+-      <Filename>gnome-file-roller.desktop</Filename>
+-      <Filename>gnome-gfloppy.desktop</Filename>
+       <Filename>redhat-authconfig.desktop</Filename>
+       <Filename>redhat-usermount.desktop</Filename>
+-      <Filename>system-config-date.desktop</Filename>
+       <Filename>system-config-keyboard.desktop</Filename>
+       <Filename>system-config-language.desktop</Filename>
+       <Filename>system-config-mouse.desktop</Filename>
+@@ -147,11 +140,8 @@
+       <Filename>system-config-securitylevel.desktop</Filename>
+       <Filename>system-config-services.desktop</Filename>
+       <Filename>system-config-soundcard.desktop</Filename>
+-      <Filename>system-config-users.desktop</Filename>
+       <Filename>redhat-neat.desktop</Filename>
+       <Filename>redhat-neat-control.desktop</Filename>
+-      <Filename>redhat-printconf-gui.desktop</Filename>
+-      <Filename>redhat-rhn-up2date-config.desktop</Filename>
+       <Filename>redhat-switchdesk.desktop</Filename>
+       <Filename>redhat-switchmail.desktop</Filename>
+       <Filename>redhat-switch-printer.desktop</Filename>
+@@ -167,8 +157,6 @@
        <And>
          <Not><Category>Core</Category></Not>
          <Not><Category>Settings</Category></Not>
@@ -95,7 +118,7 @@
      </Include>
    </Menu> <!-- End System -->
 --- redhat-menus-8.9.10/menus/system-settings.menu.categories	2007-06-27 01:38:11.000000000 -0400
-+++ redhat-menus-8.9.10/menus/system-settings.menu	2007-06-27 01:44:18.000000000 -0400
++++ redhat-menus-8.9.10/menus/system-settings.menu	2007-06-27 09:01:19.000000000 -0400
 @@ -18,7 +18,9 @@
    <DefaultMergeDirs/>
  
@@ -120,15 +143,18 @@
        <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
        <Not><Category>Screensaver</Category></Not>
      </And>
-@@ -45,35 +45,12 @@
+@@ -41,39 +41,13 @@
+ 
+   <Include>
+     <Filename>redhat-authconfig.desktop</Filename>
+-    <Filename>system-config-date.desktop</Filename>
      <Filename>system-config-keyboard.desktop</Filename>
      <Filename>system-config-language.desktop</Filename>
      <Filename>system-config-mouse.desktop</Filename>
-+    <Filename>system-config-display.desktop</Filename>
      <Filename>system-config-rootpassword.desktop</Filename>
      <Filename>system-config-securitylevel.desktop</Filename>
      <Filename>system-config-soundcard.desktop</Filename>
-     <Filename>system-config-users.desktop</Filename>
+-    <Filename>system-config-users.desktop</Filename>
      <Filename>redhat-neat.desktop</Filename>
 -    <Filename>redhat-printconf-gui.desktop</Filename>
 -    <Filename>redhat-rhn-up2date-config.desktop</Filename>


Index: redhat-menus.spec
===================================================================
RCS file: /cvs/extras/rpms/redhat-menus/devel/redhat-menus.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- redhat-menus.spec	27 Jun 2007 05:54:56 -0000	1.80
+++ redhat-menus.spec	27 Jun 2007 13:10:01 -0000	1.81
@@ -4,7 +4,7 @@
 Summary: Configuration and data files for the desktop menus
 Name: redhat-menus
 Version: 8.9.10
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 # add the preferences.menu file from upstream, which
@@ -80,6 +80,9 @@
 %{_datadir}/desktop-directories/*.directory
 
 %changelog
+* Wed Jun 27 2007 Matthias Clasen <mclasen at redhat.com> - 8.9.10-6
+- Reduce hardcoded applications where categories have been fixed
+
 * Wed Jun 27 2007 Matthias Clasen <mclasen at redhat.com> - 8.9.10-5
 - Clean up use of categories in menu files