rpms/redhat-menus/devel redhat-menus-7.8.9-cc-shell.patch, NONE, 1.1 redhat-menus.spec, 1.66, 1.67

Tue Jan 23 19:55:48 UTC 2007

Author: mclasen

Update of /cvs/dist/rpms/redhat-menus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16094

Modified Files:
	redhat-menus.spec 
Added Files:
	redhat-menus-7.8.9-cc-shell.patch 
Log Message:
add new preferences.menu


redhat-menus-7.8.9-cc-shell.patch:
 preferences.menu |  102 +++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 66 insertions(+), 36 deletions(-)

--- NEW FILE redhat-menus-7.8.9-cc-shell.patch ---
--- redhat-menus-7.8.9/menus/preferences.menu.cc-shell	2007-01-23 14:47:48.000000000 -0500
+++ redhat-menus-7.8.9/menus/preferences.menu	2007-01-23 14:48:04.000000000 -0500
@@ -3,78 +3,108 @@
 
 <Menu>
   <Name>Preferences</Name>
-  <Directory>Settings.directory</Directory>
-
-  <!-- Scan legacy dirs first, as later items take priority -->
-  <LegacyDir>/usr/share/gnome/apps</LegacyDir>
-  <LegacyDir>/etc/X11/applnk</LegacyDir>
+  <Directory>Preferences.directory</Directory>
 
   <!-- Read standard .directory and .desktop file locations -->
   <DefaultAppDirs/>
   <DefaultDirectoryDirs/>
 
-  <!-- Read in overrides and child menus from preferences.d -->
+  <!-- Read in overrides and child menus from preferences-merged/ -->
   <DefaultMergeDirs/>
 
   <!-- Stuff in the toplevel -->
   <Include>
     <And>
       <Category>Settings</Category>
-      <Category>X-Red-Hat-Base</Category>
       <Not>
         <Or>
+          <Category>PersonalSettings</Category>
+          <Category>DesktopSettings</Category>
+          <Category>NetworkSettings</Category>
+          <Category>HardwareSettings</Category>
+          <Category>SystemSettings</Category>
           <Category>System</Category>
-	  <Category>Accessibility</Category>
         </Or>
       </Not>
     </And>
   </Include>
 
+  <!-- Menu items to exclude from the toplevel -->
   <Exclude>
-      <Filename>redhat-userpasswd.desktop</Filename>
+    <Filename>gnomecc.desktop</Filename>
   </Exclude>
 
-  <!-- Accessibility -->
+  <!-- Personal submenu -->
   <Menu>
-    <Name>Accessibility</Name>
-    <Directory>Settings-Accessibility.directory</Directory>
+    <Name>Personal</Name>
+    <Directory>Personal.directory</Directory>
     <Include>
       <And>
         <Category>Settings</Category>
-        <Category>Accessibility</Category>
-        <Not>
-          <Or>
-            <Category>System</Category>
-          </Or>
-        </Not>
+        <Category>PersonalSettings</Category>
       </And>
     </Include>
-  </Menu>
+  </Menu> <!-- End Personal -->
 
-  <!-- More Prefs -->
+  <!-- Look and Feel submenu -->
+  <Menu>
+    <Name>Look and Feel</Name>
+    <Directory>LookAndFeel.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Category>DesktopSettings</Category>
+      </And>
+    </Include>
+  </Menu> <!-- End Look and Feel -->
 
+  <!-- Internet and Network submenu -->
   <Menu>
-    <Name>MorePreferences</Name>
-    <Directory>Settings-More.directory</Directory>
+    <Name>Internet and Network</Name>
+    <Directory>InternetAndNetwork.directory</Directory>
     <Include>
       <And>
         <Category>Settings</Category>
-        <Not>
-          <Or>
-            <Category>System</Category>
-            <Category>X-Red-Hat-Base-Only</Category>
-            <Category>X-Red-Hat-Base</Category>
-          </Or>
-        </Not>
+        <Category>NetworkSettings</Category>
       </And>
-      <Filename>gnome-gconf-editor</Filename>
     </Include>
+  </Menu> <!-- End Internet and Network -->
   
-    <Exclude>
-      <Filename>redhat-userinfo.desktop</Filename>
-      <Filename>gnome-gdmphotosetup.desktop</Filename>
-    </Exclude>
+  <!-- Hardware submenu -->
+  <Menu>
+    <Name>Hardware</Name>
+    <Directory>Hardware.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Category>HardwareSettings</Category>
+      </And>
+    </Include>
+  </Menu> <!-- End Hardware -->
 
-  </Menu>   <!-- End More Prefs -->
-</Menu>     <!-- End Prefs -->
+  <!-- System submenu -->
+  <Menu>
+    <Name>System</Name>
+    <Directory>System.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Or>
+          <Category>SystemSettings</Category>
+          <And>
+            <Category>System</Category>
+            <Not>
+              <Or>
+                <Category>PersonalSettings</Category>
+                <Category>DesktopSettings</Category>
+                <Category>HardwareSettings</Category>
+                <Category>NetworkSettings</Category> 
+              </Or>
+            </Not>
+          </And>
+        </Or>
+      </And>
+    </Include>
+  </Menu> <!-- End System -->
 
+</Menu>     <!-- End Prefs -->


Index: redhat-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-menus/devel/redhat-menus.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- redhat-menus.spec	11 Jan 2007 19:31:04 -0000	1.66
+++ redhat-menus.spec	23 Jan 2007 19:55:46 -0000	1.67
@@ -4,9 +4,14 @@
 Summary: Configuration and data files for the desktop menus
 Name: redhat-menus
 Version: 7.8.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
+# add the preferences.menu file from upstream, which
+# gives a much better experience in the control center shell
+# do this as a quick patch for now, we need to rethink the
+# menu situation anyway
+Patch0: redhat-menus-7.8.9-cc-shell.patch
 PreReq: desktop-file-utils >= %{desktop_file_utils_version}
 
 License: XFree86
@@ -33,6 +38,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .cc-shell
 
 %build
 
@@ -70,6 +76,9 @@
 %{_datadir}/desktop-directories/*.directory
 
 %changelog
+* Tue Jan 23 2007 Matthias Clasen <mclasen at redhat.com> - 7.8.9-3
+- Update preferences.menu for the control center shell
+
 * Thu Jan 11 2007 Matthias Clasen <mclasen at redhat.com> - 7.8.9-2
 - Resolve a conflict with gnome-menus
 


