rpms/xfdesktop/devel xfdesktop-4.6.0-redhat-menus.patch, NONE, 1.1 xfdesktop.spec, 1.30, 1.31

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xfdesktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24865

Modified Files:
	xfdesktop.spec 
Added Files:
	xfdesktop-4.6.0-redhat-menus.patch 
Log Message:
* Mon Mar 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-3
- Fix directory ownership problems
- Require xfce4-doc and redhat-menus
- Tweak and clean up Xfce menu


xfdesktop-4.6.0-redhat-menus.patch:

--- NEW FILE xfdesktop-4.6.0-redhat-menus.patch ---
--- xfdesktop-4.6.0.orig/modules/menu/menu-data/xfce-applications.menu	2009-01-12 23:03:21.000000000 +0100
+++ xfdesktop-4.6.0/modules/menu/menu-data/xfce-applications.menu	2009-02-28 23:26:49.000000000 +0100
@@ -18,7 +18,8 @@
         <Filename>xfce4-file-manager.desktop</Filename>
         <Filename>xfce4-web-browser.desktop</Filename>
         <Separator/>
-        <Menuname>Settings</Menuname>
+        <Menuname>Preferences</Menuname>
+        <Menuname>Administration</Menuname>
         <Separator/>
         <Merge type="all"/>
         <Separator/>
@@ -28,10 +29,14 @@
     </Layout>
     
     <Menu>
-        <Name>Settings</Name>
-        <Directory>xfce-settings.directory</Directory>
+        <Name>Preferences</Name>
+        <Directory>Settings.directory</Directory>
         <Include>
-            <Category>Settings</Category>
+            <And>
+                <Category>Settings</Category>
+                <Not><Category>System</Category></Not>
+                <Not><Category>Screensaver</Category></Not>
+            </And>
         </Include>
         
         <Layout>
@@ -40,25 +45,29 @@
             <Merge type="all"/>
         </Layout>
         
-        <Menu>
-            <Name>Screensavers</Name>
-            <Directory>xfce-screensavers.directory</Directory>
-            <Include>
-                <Category>Screensaver</Category>
-            </Include>
-        </Menu>
+    </Menu>
+
+    <Menu>
+        <Name>Administration</Name>
+        <Directory>SystemConfig.directory</Directory>
+        <Include>
+            <And>
+                <Category>Settings</Category>
+                <Category>System</Category>
+                <Not><Category>Screensaver</Category></Not>
+            </And>
+        </Include>
+        
     </Menu>
     
     <Menu>
         <Name>Accessories</Name>
         <Directory>xfce-accessories.directory</Directory>
         <Include>
-            <Or>
-                <Category>Accessibility</Category>
-                <Category>Core</Category>
-                <Category>Legacy</Category>
+            <And>
                 <Category>Utility</Category>
-            </Or>
+                <Not><Category>System</Category></Not>
+            </And>
         </Include>
     </Menu>
     
@@ -124,7 +133,11 @@
         <Name>System</Name>
         <Directory>xfce-system.directory</Directory>
         <Include>
-            <Category>System</Category>
+            <And>
+                <Category>System</Category>
+                <Not><Category>Settings</Category></Not>
+                <Not><Category>Screensaver</Category></Not>
+            </And>
         </Include>
     </Menu>
     
@@ -133,7 +146,13 @@
         <Directory>xfce-other.directory</Directory>
         <OnlyUnallocated/>
         <Include>
-            <All/>
+            <And>
+                <Not><Category>Core</Category></Not>
+                <Not><Category>Settings</Category></Not>
+                <Not><Category>SystemSetup</Category></Not>
+                <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
+                <Not><Category>Screensaver</Category></Not>
+            </And>
         </Include>
     </Menu>
     


Index: xfdesktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xfdesktop.spec	28 Feb 2009 04:01:51 -0000	1.30
+++ xfdesktop.spec	2 Mar 2009 22:22:35 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
 Version: 4.6.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfdesktop-%{version}.tar.bz2
@@ -10,6 +10,8 @@
 Patch0: xfdesktop-4.5.92-backdrop-image.patch
 # Enable distro specific logo in desktop menu
 Patch1: xfdesktop-4.5.92-desktop-menu-icon.patch
+# Use redhat-menus to avoid duplicate entries in the menu
+Patch2: xfdesktop-4.6.0-redhat-menus.patch
 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,6 +19,8 @@
 Requires: xfwm4
 Requires: xfce4-panel
 Requires: desktop-backgrounds-basic
+Requires: xfce4-doc
+Requires: redhat-menus
 BuildRequires: libxfcegui4-devel >= %{version}
 BuildRequires: xfce4-panel-devel >= %{version}
 BuildRequires: libxml2-devel
@@ -40,6 +44,7 @@
 
 %patch0 -p1 -b .backdrop
 %patch1 -p1 -b .distro-logo
+%patch2 -p1 -b .orig
 
 %build
 %configure
@@ -76,7 +81,8 @@
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/pixmaps/*
-%{_datadir}/xfce4/doc
+%doc %{_datadir}/xfce4/doc/*/images/*
+%doc %{_datadir}/xfce4/doc/*/*.html
 %{_datadir}/xfce4/backdrops
 %{_mandir}/man1/*
 %config(noreplace) %{_sysconfdir}/xdg/menus/xfce-applications.menu
@@ -84,6 +90,11 @@
 %{_datadir}/xfce4/panel-plugins/xfce4-menu.desktop
 
 %changelog
+* Mon Mar 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-3
+- Fix directory ownership problems
+- Require xfce4-doc and redhat-menus
+- Tweak and clean up Xfce menu
+
 * Fri Feb 27 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-2
 - Add libSM-devel to BuildRequires