rpms/redhat-menus/devel categories.patch, 1.4, 1.5 redhat-menus.spec, 1.84, 1.85
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Fri Sep 7 14:05:26 UTC 2007
Author: mclasen
Update of /cvs/extras/rpms/redhat-menus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27067
Modified Files:
categories.patch redhat-menus.spec
Log Message:
More category finetuning; remove remaining overrides
categories.patch:
Index: categories.patch
===================================================================
RCS file: /cvs/extras/rpms/redhat-menus/devel/categories.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- categories.patch 3 Jul 2007 02:48:28 -0000 1.4
+++ categories.patch 7 Sep 2007 14:04:52 -0000 1.5
@@ -1,7 +1,51 @@
+diff -up redhat-menus-8.9.10/menus/server-settings.menu.categories redhat-menus-8.9.10/menus/server-settings.menu
+--- redhat-menus-8.9.10/menus/server-settings.menu.categories 2007-09-07 10:01:24.000000000 -0400
++++ redhat-menus-8.9.10/menus/server-settings.menu 2007-09-07 10:01:34.000000000 -0400
+@@ -21,7 +21,6 @@
+ <Include>
+ <And>
+ <Category>X-Red-Hat-Base</Category>
+- <Category>Application</Category>
+ <Category>X-Red-Hat-ServerConfig</Category>
+ </And>
+ </Include>
+@@ -34,7 +33,6 @@
+ <And>
+ <Not><Category>X-Red-Hat-Base-Only</Category></Not>
+ <Not><Category>X-Red-Hat-Base</Category></Not>
+- <Category>Application</Category>
+ <Category>X-Red-Hat-ServerConfig</Category>
+ </And>
+ </Include>
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-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 @@
+--- redhat-menus-8.9.10/menus/applications.menu.categories 2007-09-07 10:01:04.000000000 -0400
++++ redhat-menus-8.9.10/menus/applications.menu 2007-09-07 10:01:04.000000000 -0400
+@@ -43,7 +43,6 @@
+ <And>
+ <Category>Development</Category>
+ </And>
+- <Filename>emacs.desktop</Filename>
+ </Include>
+ </Menu> <!-- End Development Tools -->
+
+@@ -77,8 +76,6 @@
+ <And>
+ <Category>Graphics</Category>
+ </And>
+- <Filename>dia.desktop</Filename>
+- <Filename>drawing.desktop</Filename>
+ </Include>
+ </Menu> <!-- End Graphics -->
+
+@@ -89,6 +86,7 @@
+ <Include>
+ <And>
+ <Category>Network</Category>
++ <Not><Category>Settings</Category></Not>
+ </And>
+ </Include>
+ </Menu> <!-- End Internet -->
+@@ -123,38 +121,13 @@
<Include>
<And>
<Category>System</Category>
@@ -18,27 +62,30 @@
- <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>redhat-authconfig.desktop</Filename>
+- <Filename>redhat-usermount.desktop</Filename>
- <Filename>system-config-date.desktop</Filename>
- <Filename>system-config-keyboard.desktop</Filename>
+- <Filename>system-config-keyboard.desktop</Filename>
- <Filename>system-config-language.desktop</Filename>
- <Filename>system-config-mouse.desktop</Filename>
- <Filename>system-config-nfs.desktop</Filename>
+- <Filename>system-config-mouse.desktop</Filename>
+- <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>
+- <Filename>system-config-rootpassword.desktop</Filename>
+- <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-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,7 +156,6 @@
+- <Filename>redhat-switchdesk.desktop</Filename>
+- <Filename>redhat-switchmail.desktop</Filename>
+- <Filename>redhat-switch-printer.desktop</Filename>
+ </Exclude>
+ </Menu> <!-- End System Tools -->
+
+@@ -167,7 +140,6 @@
<And>
<Not><Category>Core</Category></Not>
<Not><Category>Settings</Category></Not>
@@ -47,8 +94,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-07-02 22:35:48.000000000 -0400
-+++ redhat-menus-8.9.10/menus/preferences.menu 2007-07-02 22:35:48.000000000 -0400
+--- redhat-menus-8.9.10/menus/preferences.menu.categories 2007-09-07 10:01:04.000000000 -0400
++++ redhat-menus-8.9.10/menus/preferences.menu 2007-09-07 10:01:04.000000000 -0400
@@ -28,12 +28,12 @@
<Category>Settings</Category>
<Not>
@@ -122,7 +169,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-07-02 22:36:56.000000000 -0400
++++ redhat-menus-8.9.10/menus/system-settings.menu 2007-09-07 10:01:04.000000000 -0400
@@ -18,7 +18,9 @@
<DefaultMergeDirs/>
@@ -134,7 +181,7 @@
<!-- Merge in server settings -->
<Menu>
-@@ -30,10 +32,8 @@
+@@ -30,50 +32,11 @@
<Include>
<And>
@@ -147,24 +194,23 @@
<Not><Category>X-Red-Hat-ServerConfig</Category></Not>
<Not><Category>Screensaver</Category></Not>
</And>
-@@ -41,39 +41,13 @@
+ </Include>
- <Include>
- <Filename>redhat-authconfig.desktop</Filename>
+- <Include>
+- <Filename>redhat-authconfig.desktop</Filename>
- <Filename>system-config-date.desktop</Filename>
- <Filename>system-config-keyboard.desktop</Filename>
+- <Filename>system-config-keyboard.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>
- <Filename>system-config-soundcard.desktop</Filename>
+- <Filename>system-config-mouse.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-lvm.desktop</Filename>
- <Filename>redhat-neat.desktop</Filename>
+- <Filename>redhat-neat.desktop</Filename>
- <Filename>redhat-printconf-gui.desktop</Filename>
- <Filename>redhat-rhn-up2date-config.desktop</Filename>
- </Include>
-
+- </Include>
+-
- <Exclude>
- <Filename>system-config-packages.desktop</Filename>
- </Exclude>
Index: redhat-menus.spec
===================================================================
RCS file: /cvs/extras/rpms/redhat-menus/devel/redhat-menus.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- redhat-menus.spec 6 Sep 2007 17:30:54 -0000 1.84
+++ redhat-menus.spec 7 Sep 2007 14:04:52 -0000 1.85
@@ -4,7 +4,7 @@
Summary: Configuration and data files for the desktop menus
Name: redhat-menus
Version: 8.9.10
-Release: 9%{?dist}
+Release: 10%{?dist}
URL: http://www.redhat.com
Source0: %{name}-%{version}.tar.gz
# add the preferences.menu file from upstream, which
@@ -85,6 +85,9 @@
%{_datadir}/desktop-directories/*.directory
%changelog
+* Fri Sep 7 2007 Matthias Clasen <mclasen at redhat.com> - 8.9.10-10
+- More category finetuning; remove remaining overrides
+
* Thu Sep 6 2007 Ray Strode <rstrode at redhat.com> - 8.9.10-9
- create /etx/xdg/menus/settings-merged by default
More information about the fedora-extras-commits
mailing list