rpms/xfdesktop/devel xfdesktop-4.6.0-redhat-menus.patch, 1.1, 1.2 xfdesktop.spec, 1.32, 1.33

[Christoph Wickert]

Author: cwickert

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

Modified Files:
	xfdesktop-4.6.0-redhat-menus.patch xfdesktop.spec 
Log Message:
* Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-4
- Exclude gnome-default-applications from menu to avoid duplicates (#488558)


xfdesktop-4.6.0-redhat-menus.patch:

Index: xfdesktop-4.6.0-redhat-menus.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xfdesktop/devel/xfdesktop-4.6.0-redhat-menus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfdesktop-4.6.0-redhat-menus.patch	2 Mar 2009 22:22:35 -0000	1.1
+++ xfdesktop-4.6.0-redhat-menus.patch	13 Apr 2009 20:52:25 -0000	1.2
@@ -1,5 +1,5 @@
 --- 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
++++ xfdesktop-4.6.0/modules/menu/menu-data/xfce-applications.menu	2009-04-13 21:36:32.000000000 +0200
 @@ -18,7 +18,8 @@
          <Filename>xfce4-file-manager.desktop</Filename>
          <Filename>xfce4-web-browser.desktop</Filename>
@@ -10,7 +10,7 @@
          <Separator/>
          <Merge type="all"/>
          <Separator/>
-@@ -28,10 +29,14 @@
+@@ -28,10 +29,15 @@
      </Layout>
      
      <Menu>
@@ -24,11 +24,12 @@
 +                <Category>Settings</Category>
 +                <Not><Category>System</Category></Not>
 +                <Not><Category>Screensaver</Category></Not>
++                <Not><Filename>gnome-default-applications.desktop</Filename></Not>
 +            </And>
          </Include>
          
          <Layout>
-@@ -40,25 +45,29 @@
+@@ -40,25 +46,29 @@
              <Merge type="all"/>
          </Layout>
          
@@ -70,7 +71,7 @@
          </Include>
      </Menu>
      
-@@ -124,7 +133,11 @@
+@@ -124,7 +134,11 @@
          <Name>System</Name>
          <Directory>xfce-system.directory</Directory>
          <Include>
@@ -83,7 +84,7 @@
          </Include>
      </Menu>
      
-@@ -133,7 +146,13 @@
+@@ -133,7 +147,13 @@
          <Directory>xfce-other.directory</Directory>
          <OnlyUnallocated/>
          <Include>


Index: xfdesktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xfdesktop.spec	2 Mar 2009 22:27:43 -0000	1.32
+++ xfdesktop.spec	13 Apr 2009 20:52:25 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
 Version: 4.6.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfdesktop-%{version}.tar.bz2
@@ -90,6 +90,9 @@
 %{_datadir}/xfce4/panel-plugins/xfce4-menu.desktop
 
 %changelog
+* Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-4
+- Exclude gnome-default-applications from menu to avoid duplicates (#488558)
+
 * Mon Mar 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-3
 - Fix directory ownership problems
 - Require xfce4-doc and redhat-menus