Author: fcrozat
Date: Thu Feb 15 14:16:33 2007
New Revision: 121383

Added:
   
packages/cooker/gnome-menus/current/SOURCES/gnome-menus-2.17.91-uncluttermenu.patch
   packages/cooker/gnome-menus/current/SOURCES/gnome-menus-2.17.91.tar.bz2   
(contents, props changed)
Removed:
   
packages/cooker/gnome-menus/current/SOURCES/gnome-menus-2.17.5-uncluttermenu.patch
   packages/cooker/gnome-menus/current/SOURCES/gnome-menus-2.17.5.tar.bz2
Modified:
   packages/cooker/gnome-menus/current/SPECS/gnome-menus.spec

Log:
-Release 2.17.91
-update patch1 to show preferences/admin submenus and only GNOME settings 
applications


Added: 
packages/cooker/gnome-menus/current/SOURCES/gnome-menus-2.17.91-uncluttermenu.patch
==============================================================================
--- (empty file)
+++ 
packages/cooker/gnome-menus/current/SOURCES/gnome-menus-2.17.91-uncluttermenu.patch
 Thu Feb 15 14:16:33 2007
@@ -0,0 +1,68 @@
+--- gnome-menus-2.17.91/layout/preferences.menu.uncluttermenu  2007-02-13 
10:18:01.000000000 +0100
++++ gnome-menus-2.17.91/layout/preferences.menu        2007-02-15 
13:53:33.000000000 +0100
+@@ -14,15 +14,19 @@
+ 
+   <!-- Stuff in the toplevel -->
+   <Include>
++    <Or>
+     <And>
++      <Category>GNOME</Category>
+       <Category>Settings</Category>
+       <Not>
+         <Or>
+           <Category>System</Category>
+           <Category>Accessibility</Category>
++          
<Category>X-MandrivaLinux-System-Configuration-GNOME-Advanced</Category>
+         </Or>
+       </Not>
+     </And>
++   </Or>
+   </Include>
+ 
+   <!-- Menu items to exclude from the toplevel -->
+@@ -42,4 +46,14 @@
+     </Include>
+   </Menu>
+ 
++  <Menu>
++    <Name>Advanced</Name>
++    
<Directory>mandriva-system-configuration-gnome-advanced.directory</Directory>
++    <Include>
++      <And>
++        
<Category>X-MandrivaLinux-System-Configuration-GNOME-Advanced</Category>
++      </And>
++    </Include>
++  </Menu>
++
+ </Menu>     <!-- End Prefs -->
+--- gnome-menus-2.17.91/layout/settings.menu.uncluttermenu     2007-02-13 
10:18:01.000000000 +0100
++++ gnome-menus-2.17.91/layout/settings.menu   2007-02-13 16:09:57.000000000 
+0100
+@@ -29,10 +29,14 @@
+     <Name>Administration</Name>
+     <Directory>System-Settings.directory</Directory>
+     <Include>
++     <Or>
+       <And>
+         <Category>Settings</Category>
+         <Category>System</Category>
+       </And>
++      <Category>X-MandrivaLinux-System-Configuration</Category>
++      </Or>
++
+     </Include>
+   </Menu>     <!-- End System Settings -->
+ 
+--- 
gnome-menus-2.17.91/desktop-directories/Preferences.directory.in.uncluttermenu  
   2007-02-15 14:06:03.000000000 +0100
++++ gnome-menus-2.17.91/desktop-directories/Preferences.directory.in   
2007-02-15 14:06:09.000000000 +0100
+@@ -4,4 +4,3 @@
+ Icon=gnome-settings
+ Type=Directory
+ Encoding=UTF-8
+-NoDisplay=true
+--- 
gnome-menus-2.17.91/desktop-directories/System-Settings.directory.in.uncluttermenu
 2007-02-15 14:10:57.000000000 +0100
++++ gnome-menus-2.17.91/desktop-directories/System-Settings.directory.in       
2007-02-15 14:11:08.000000000 +0100
+@@ -4,4 +4,3 @@
+ _Comment=Change systemwide settings (affects all users)
+ Icon=gnome-system
+ Encoding=UTF-8
+-NoDisplay=true

Added: packages/cooker/gnome-menus/current/SOURCES/gnome-menus-2.17.91.tar.bz2
==============================================================================
Binary file. No diff available.

Modified: packages/cooker/gnome-menus/current/SPECS/gnome-menus.spec
==============================================================================
--- packages/cooker/gnome-menus/current/SPECS/gnome-menus.spec  (original)
+++ packages/cooker/gnome-menus/current/SPECS/gnome-menus.spec  Thu Feb 15 
14:16:33 2007
@@ -3,13 +3,13 @@
 
 Summary: GNOME menu library
 Name: gnome-menus
-Version: 2.17.5
+Version: 2.17.91
 Release: %mkrel 1
 Source0: 
http://ftp.gnome.org/pub/GNOME/sources/%name/%{name}-%{version}.tar.bz2
 # (fc) 2.15.91-2mdv grab translation from menu-messages if not in upstream file
 Patch0: gnome-menus-2.15.91-l10n.patch
 # (fc) 2.16.0-2mdv unclutter preferences/settings menu
-Patch1: gnome-menus-2.17.5-uncluttermenu.patch
+Patch1: gnome-menus-2.17.91-uncluttermenu.patch
 
 License: GPL/LGPL
 Group: System/Libraries

Reply via email to