rpms/redhat-menus/devel categories.patch, 1.3, 1.4 redhat-menus.spec, 1.82, 1.83

[Matthias Clasen (mclasen)]

Author: mclasen

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

Modified Files:
	categories.patch redhat-menus.spec 
Log Message:
More category finetuning


categories.patch:

Index: categories.patch
===================================================================
RCS file: /cvs/extras/rpms/redhat-menus/devel/categories.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- categories.patch	28 Jun 2007 03:51:27 -0000	1.3
+++ categories.patch	3 Jul 2007 02:48:28 -0000	1.4
@@ -1,7 +1,7 @@
 diff -up redhat-menus-8.9.10/menus/applications.menu.categories redhat-menus-8.9.10/menus/applications.menu
---- redhat-menus-8.9.10/menus/applications.menu.categories	2007-06-27 23:42:13.000000000 -0400
-+++ redhat-menus-8.9.10/menus/applications.menu	2007-06-27 23:42:48.000000000 -0400
-@@ -123,21 +123,14 @@
+--- redhat-menus-8.9.10/menus/applications.menu.categories	2007-07-02 22:35:48.000000000 -0400
++++ redhat-menus-8.9.10/menus/applications.menu	2007-07-02 22:36:44.000000000 -0400
+@@ -123,23 +123,15 @@
      <Include>
        <And>
          <Category>System</Category>
@@ -22,9 +22,11 @@
        <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-language.desktop</Filename>
        <Filename>system-config-mouse.desktop</Filename>
-@@ -147,11 +140,8 @@
+       <Filename>system-config-nfs.desktop</Filename>
+       <Filename>pirut.desktop</Filename>
+@@ -147,11 +139,8 @@
        <Filename>system-config-securitylevel.desktop</Filename>
        <Filename>system-config-services.desktop</Filename>
        <Filename>system-config-soundcard.desktop</Filename>
@@ -36,7 +38,7 @@
        <Filename>redhat-switchdesk.desktop</Filename>
        <Filename>redhat-switchmail.desktop</Filename>
        <Filename>redhat-switch-printer.desktop</Filename>
-@@ -167,7 +157,6 @@
+@@ -167,7 +156,6 @@
        <And>
          <Not><Category>Core</Category></Not>
          <Not><Category>Settings</Category></Not>
@@ -45,8 +47,8 @@
          <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
          <Not><Category>Screensaver</Category></Not>
 diff -up redhat-menus-8.9.10/menus/preferences.menu.categories redhat-menus-8.9.10/menus/preferences.menu
---- redhat-menus-8.9.10/menus/preferences.menu.categories	2007-06-27 23:42:13.000000000 -0400
-+++ redhat-menus-8.9.10/menus/preferences.menu	2007-06-27 23:42:13.000000000 -0400
+--- redhat-menus-8.9.10/menus/preferences.menu.categories	2007-07-02 22:35:48.000000000 -0400
++++ redhat-menus-8.9.10/menus/preferences.menu	2007-07-02 22:35:48.000000000 -0400
 @@ -28,12 +28,12 @@
        <Category>Settings</Category>
        <Not>
@@ -120,7 +122,7 @@
    </Menu> <!-- End System -->
 diff -up redhat-menus-8.9.10/menus/system-settings.menu.categories redhat-menus-8.9.10/menus/system-settings.menu
 --- redhat-menus-8.9.10/menus/system-settings.menu.categories	2007-03-19 13:45:14.000000000 -0400
-+++ redhat-menus-8.9.10/menus/system-settings.menu	2007-06-27 23:43:16.000000000 -0400
++++ redhat-menus-8.9.10/menus/system-settings.menu	2007-07-02 22:36:56.000000000 -0400
 @@ -18,7 +18,9 @@
    <DefaultMergeDirs/>
  
@@ -145,13 +147,13 @@
        <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
        <Not><Category>Screensaver</Category></Not>
      </And>
-@@ -41,39 +41,14 @@
+@@ -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-language.desktop</Filename>
      <Filename>system-config-mouse.desktop</Filename>
      <Filename>system-config-rootpassword.desktop</Filename>
      <Filename>system-config-securitylevel.desktop</Filename>


Index: redhat-menus.spec
===================================================================
RCS file: /cvs/extras/rpms/redhat-menus/devel/redhat-menus.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- redhat-menus.spec	28 Jun 2007 03:51:27 -0000	1.82
+++ redhat-menus.spec	3 Jul 2007 02:48:28 -0000	1.83
@@ -4,7 +4,7 @@
 Summary: Configuration and data files for the desktop menus
 Name: redhat-menus
 Version: 8.9.10
-Release: 7%{?dist}
+Release: 8%{?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 Jul  2 2007 Matthias Clasen <mclasen at redhat.com> - 8.9.10-8
+- More category finetuning
+
 * Wed Jun 27 2007 Matthias Clasen <mclasen at redhat.com> - 8.9.10-7
 - More category finetuning