[garcon] - Include rebased redhat-menus.patch
Christoph Wickert
cwickert at fedoraproject.org
Mon Jan 17 13:28:54 UTC 2011
commit f893a08e4359c610b4bfea2859c800f552863613
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date: Mon Jan 17 14:26:33 2011 +0100
- Include rebased redhat-menus.patch
garcon-0.1.3-redhat-menus.patch | 359 ----------------------
garcon-0.1.5-redhat-menus.patch | 647 +++++++++++++++++++++++++++++++++++++++
garcon.spec | 20 +-
3 files changed, 652 insertions(+), 374 deletions(-)
---
diff --git a/garcon-0.1.5-redhat-menus.patch b/garcon-0.1.5-redhat-menus.patch
new file mode 100644
index 0000000..2564999
--- /dev/null
+++ b/garcon-0.1.5-redhat-menus.patch
@@ -0,0 +1,647 @@
+diff -Nur garcon-0.1.5.orig/data/xfce/Makefile.am garcon-0.1.5/data/xfce/Makefile.am
+--- garcon-0.1.5.orig/data/xfce/Makefile.am 2011-01-16 14:27:39.000000000 +0100
++++ garcon-0.1.5/data/xfce/Makefile.am 2011-01-16 22:47:07.441111649 +0100
+@@ -22,20 +22,7 @@
+ xfce-applications.menu
+
+ directorydir = $(datadir)/desktop-directories
+-directory_in_files = \
+- xfce-accessories.directory.in \
+- xfce-development.directory.in \
+- xfce-education.directory.in \
+- xfce-games.directory.in \
+- xfce-graphics.directory.in \
+- xfce-multimedia.directory.in \
+- xfce-network.directory.in \
+- xfce-office.directory.in \
+- xfce-other.directory.in \
+- xfce-science.directory.in \
+- xfce-screensavers.directory.in \
+- xfce-settings.directory.in \
+- xfce-system.directory.in
++directory_in_files = xfce-other.directory.in
+
+ directory_DATA = $(directory_in_files:.directory.in=.directory)
+ @INTLTOOL_DIRECTORY_RULE@
+diff -Nur garcon-0.1.5.orig/data/xfce/Makefile.in garcon-0.1.5/data/xfce/Makefile.in
+--- garcon-0.1.5.orig/data/xfce/Makefile.in 2011-01-16 14:35:58.000000000 +0100
++++ garcon-0.1.5/data/xfce/Makefile.in 2011-01-16 22:47:06.409162261 +0100
+@@ -273,20 +273,7 @@
+ xfce-applications.menu
+
+ directorydir = $(datadir)/desktop-directories
+-directory_in_files = \
+- xfce-accessories.directory.in \
+- xfce-development.directory.in \
+- xfce-education.directory.in \
+- xfce-games.directory.in \
+- xfce-graphics.directory.in \
+- xfce-multimedia.directory.in \
+- xfce-network.directory.in \
+- xfce-office.directory.in \
+- xfce-other.directory.in \
+- xfce-science.directory.in \
+- xfce-screensavers.directory.in \
+- xfce-settings.directory.in \
+- xfce-system.directory.in
++directory_in_files = xfce-other.directory.in
+
+ directory_DATA = $(directory_in_files:.directory.in=.directory)
+ EXTRA_DIST = \
+diff -Nur garcon-0.1.5.orig/data/xfce/xfce-accessories.directory.in garcon-0.1.5/data/xfce/xfce-accessories.directory.in
+--- garcon-0.1.5.orig/data/xfce/xfce-accessories.directory.in 2011-01-16 14:27:39.000000000 +0100
++++ garcon-0.1.5/data/xfce/xfce-accessories.directory.in 1970-01-01 01:00:00.000000000 +0100
+@@ -1,6 +0,0 @@
+-[Desktop Entry]
+-Version=1.0
+-Type=Directory
+-Icon=applications-accessories
+-_Name=Accessories
+-_Comment=Common desktop tools and applications
+diff -Nur garcon-0.1.5.orig/data/xfce/xfce-applications.menu garcon-0.1.5/data/xfce/xfce-applications.menu
+--- garcon-0.1.5.orig/data/xfce/xfce-applications.menu 2011-01-16 14:27:39.000000000 +0100
++++ garcon-0.1.5/data/xfce/xfce-applications.menu 2011-01-17 14:16:45.184982061 +0100
+@@ -19,20 +19,28 @@
+ <Filename>exo-mail-reader.desktop</Filename>
+ <Filename>exo-web-browser.desktop</Filename>
+ <Separator/>
+- <Menuname>Settings</Menuname>
++ <Menuname>Preferences</Menuname>
++ <Menuname>Administration</Menuname>
+ <Separator/>
+ <Merge type="all"/>
+ <Separator/>
++ <Menuname>Documentation</Menuname>
+ <Filename>xfhelp4.desktop</Filename>
+ <Filename>xfce4-about.desktop</Filename>
+ <Filename>xfce4-session-logout.desktop</Filename>
+ </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>
++ <Not><Filename>fedora-im-chooser.desktop</Filename></Not>
++ <Not><Filename>gnome-default-applications.desktop</Filename></Not>
++ </And>
+ </Include>
+
+ <Layout>
+@@ -41,25 +49,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>
++ <Directory>Utility.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>
+ <Exclude>
+ <Or>
+@@ -80,16 +92,27 @@
+ </Menu>
+
+ <Menu>
++ <Name>Documentation</Name>
++ <Directory>Documentation.directory</Directory>
++ <Include>
++ <Category>Documentation</Category>
++ </Include>
++ </Menu>
++
++ <Menu>
+ <Name>Education</Name>
+- <Directory>xfce-education.directory</Directory>
++ <Directory>Education.directory</Directory>
+ <Include>
+- <Category>Education</Category>
++ <Or>
++ <Category>Education</Category>
++ <Category>Science</Category>
++ </Or>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Games</Name>
+- <Directory>xfce-games.directory</Directory>
++ <Directory>Games.directory</Directory>
+ <Include>
+ <Category>Game</Category>
+ </Include>
+@@ -97,7 +120,7 @@
+
+ <Menu>
+ <Name>Graphics</Name>
+- <Directory>xfce-graphics.directory</Directory>
++ <Directory>Graphics.directory</Directory>
+ <Include>
+ <Category>Graphics</Category>
+ </Include>
+@@ -105,7 +128,7 @@
+
+ <Menu>
+ <Name>Multimedia</Name>
+- <Directory>xfce-multimedia.directory</Directory>
++ <Directory>AudioVideo.directory</Directory>
+ <Include>
+ <Category>Audio</Category>
+ <Category>Video</Category>
+@@ -115,7 +138,7 @@
+
+ <Menu>
+ <Name>Network</Name>
+- <Directory>xfce-network.directory</Directory>
++ <Directory>Network.directory</Directory>
+ <Include>
+ <Category>Network</Category>
+ </Include>
+@@ -129,7 +152,7 @@
+
+ <Menu>
+ <Name>Office</Name>
+- <Directory>xfce-office.directory</Directory>
++ <Directory>Office.directory</Directory>
+ <Include>
+ <Category>Office</Category>
+ </Include>
+@@ -145,12 +168,16 @@
+
+ <Menu>
+ <Name>System</Name>
+- <Directory>xfce-system.directory</Directory>
++ <Directory>System.directory</Directory>
+ <Include>
+- <Or>
+- <Category>Emulator</Category>
+- <Category>System</Category>
+- </Or>
++ <And>
++ <Or>
++ <Category>Emulator</Category>
++ <Category>System</Category>
++ </Or>
++ <Not><Category>Settings</Category></Not>
++ <Not><Category>Screensaver</Category></Not>
++ </And>
+ </Include>
+ <Exclude>
+ <Or>
+@@ -164,7 +191,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>
+
+diff -Nur garcon-0.1.5.orig/data/xfce/xfce-applications.menu.orig garcon-0.1.5/data/xfce/xfce-applications.menu.orig
+--- garcon-0.1.5.orig/data/xfce/xfce-applications.menu.orig 1970-01-01 01:00:00.000000000 +0100
++++ garcon-0.1.5/data/xfce/xfce-applications.menu.orig 2011-01-16 22:50:05.081399045 +0100
+@@ -0,0 +1,171 @@
++<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
++ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
++
++<Menu>
++ <Name>Xfce</Name>
++
++ <DefaultAppDirs/>
++ <DefaultDirectoryDirs/>
++
++ <Include>
++ <Category>X-Xfce-Toplevel</Category>
++ </Include>
++
++ <Layout>
++ <Filename>xfrun4.desktop</Filename>
++ <Separator/>
++ <Filename>exo-terminal-emulator.desktop</Filename>
++ <Filename>exo-file-manager.desktop</Filename>
++ <Filename>exo-mail-reader.desktop</Filename>
++ <Filename>exo-web-browser.desktop</Filename>
++ <Separator/>
++ <Menuname>Settings</Menuname>
++ <Separator/>
++ <Merge type="all"/>
++ <Separator/>
++ <Filename>xfhelp4.desktop</Filename>
++ <Filename>xfce4-about.desktop</Filename>
++ <Filename>xfce4-session-logout.desktop</Filename>
++ </Layout>
++
++ <Menu>
++ <Name>Settings</Name>
++ <Directory>xfce-settings.directory</Directory>
++ <Include>
++ <Category>Settings</Category>
++ </Include>
++
++ <Layout>
++ <Filename>xfce-settings-manager.desktop</Filename>
++ <Separator/>
++ <Merge type="all"/>
++ </Layout>
++
++ <Menu>
++ <Name>Screensavers</Name>
++ <Directory>xfce-screensavers.directory</Directory>
++ <Include>
++ <Category>Screensaver</Category>
++ </Include>
++ </Menu>
++ </Menu>
++
++ <Menu>
++ <Name>Accessories</Name>
++ <Directory>xfce-accessories.directory</Directory>
++ <Include>
++ <Or>
++ <Category>Accessibility</Category>
++ <Category>Core</Category>
++ <Category>Legacy</Category>
++ <Category>Utility</Category>
++ </Or>
++ </Include>
++ <Exclude>
++ <Or>
++ <Filename>exo-file-manager.desktop</Filename>
++ <Filename>exo-terminal-emulator.desktop</Filename>
++ <Filename>xfce4-about.desktop</Filename>
++ <Filename>xfrun4.desktop</Filename>
++ </Or>
++ </Exclude>
++ </Menu>
++
++ <Menu>
++ <Name>Development</Name>
++ <Directory>xfce-development.directory</Directory>
++ <Include>
++ <Category>Development</Category>
++ </Include>
++ </Menu>
++
++ <Menu>
++ <Name>Education</Name>
++ <Directory>xfce-education.directory</Directory>
++ <Include>
++ <Category>Education</Category>
++ </Include>
++ </Menu>
++
++ <Menu>
++ <Name>Games</Name>
++ <Directory>xfce-games.directory</Directory>
++ <Include>
++ <Category>Game</Category>
++ </Include>
++ </Menu>
++
++ <Menu>
++ <Name>Graphics</Name>
++ <Directory>xfce-graphics.directory</Directory>
++ <Include>
++ <Category>Graphics</Category>
++ </Include>
++ </Menu>
++
++ <Menu>
++ <Name>Multimedia</Name>
++ <Directory>xfce-multimedia.directory</Directory>
++ <Include>
++ <Category>Audio</Category>
++ <Category>Video</Category>
++ <Category>AudioVideo</Category>
++ </Include>
++ </Menu>
++
++ <Menu>
++ <Name>Network</Name>
++ <Directory>xfce-network.directory</Directory>
++ <Include>
++ <Category>Network</Category>
++ </Include>
++ <Exclude>
++ <Or>
++ <Filename>exo-mail-reader.desktop</Filename>
++ <Filename>exo-web-browser.desktop</Filename>
++ </Or>
++ </Exclude>
++ </Menu>
++
++ <Menu>
++ <Name>Office</Name>
++ <Directory>xfce-office.directory</Directory>
++ <Include>
++ <Category>Office</Category>
++ </Include>
++ </Menu>
++
++ <Menu>
++ <Name>Science</Name>
++ <Directory>xfce-science.directory</Directory>
++ <Include>
++ <Category>Science</Category>
++ </Include>
++ </Menu>
++
++ <Menu>
++ <Name>System</Name>
++ <Directory>xfce-system.directory</Directory>
++ <Include>
++ <Or>
++ <Category>Emulator</Category>
++ <Category>System</Category>
++ </Or>
++ </Include>
++ <Exclude>
++ <Or>
++ <Filename>xfce4-session-logout.desktop</Filename>
++ </Or>
++ </Exclude>
++ </Menu>
++
++ <Menu>
++ <Name>Other</Name>
++ <Directory>xfce-other.directory</Directory>
++ <OnlyUnallocated/>
++ <Include>
++ <All/>
++ </Include>
++ </Menu>
++
++</Menu>
+diff -Nur garcon-0.1.5.orig/data/xfce/xfce-applications.menu.rej garcon-0.1.5/data/xfce/xfce-applications.menu.rej
+--- garcon-0.1.5.orig/data/xfce/xfce-applications.menu.rej 1970-01-01 01:00:00.000000000 +0100
++++ garcon-0.1.5/data/xfce/xfce-applications.menu.rej 2011-01-16 23:38:37.307043105 +0100
+@@ -0,0 +1,115 @@
++--- xfce-applications.menu 2010-11-07 11:36:28.000000000 +0100
+++++ xfce-applications.menu 2010-12-04 10:55:31.535313030 +0100
++@@ -19,20 +19,28 @@
++ <Filename>exo-mail-reader.desktop</Filename>
++ <Filename>exo-web-browser.desktop</Filename>
++ <Separator/>
++- <Menuname>Settings</Menuname>
+++ <Menuname>Preferences</Menuname>
+++ <Menuname>Administration</Menuname>
++ <Separator/>
++ <Merge type="all"/>
++ <Separator/>
+++ <Menuname>Documentation</Menuname>
++ <Filename>xfhelp4.desktop</Filename>
++ <Filename>xfce4-about.desktop</Filename>
++ <Filename>xfce4-session-logout.desktop</Filename>
++ </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>
+++ <Not><Filename>fedora-im-chooser.desktop</Filename></Not>
+++ <Not><Filename>gnome-default-applications.desktop</Filename></Not>
+++ </And>
++ </Include>
++
++ <Layout>
++@@ -41,47 +49,62 @@
++ <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>
+++ <Directory>Utility.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>
++
++ <Menu>
++ <Name>Development</Name>
++- <Directory>xfce-development.directory</Directory>
+++ <Directory>Development.directory</Directory>
++ <Include>
++ <Category>Development</Category>
++ </Include>
++ </Menu>
++
++ <Menu>
+++ <Name>Documentation</Name>
+++ <Directory>Documentation.directory</Directory>
+++ <Include>
+++ <Category>Documentation</Category>
+++ </Include>
+++ </Menu>
+++
+++ <Menu>
++ <Name>Education</Name>
++- <Directory>xfce-education.directory</Directory>
+++ <Directory>Education.directory</Directory>
++ <Include>
++- <Category>Education</Category>
+++ <Or>
+++ <Category>Education</Category>
+++ <Category>Science</Category>
+++ </Or>
++ </Include>
++ </Menu>
++
++ <Menu>
++ <Name>Games</Name>
++- <Directory>xfce-games.directory</Directory>
+++ <Directory>Games.directory</Directory>
++ <Include>
++ <Category>Game</Category>
++ </Include>
+diff -Nur garcon-0.1.5.orig/data/xfce/xfce-development.directory.in garcon-0.1.5/data/xfce/xfce-development.directory.in
+--- garcon-0.1.5.orig/data/xfce/xfce-development.directory.in 2011-01-16 14:27:39.000000000 +0100
++++ garcon-0.1.5/data/xfce/xfce-development.directory.in 1970-01-01 01:00:00.000000000 +0100
+@@ -1,6 +0,0 @@
+-[Desktop Entry]
+-Version=1.0
+-Type=Directory
+-Icon=applications-development
+-_Name=Development
+-_Comment=Software development tools
+diff -Nur garcon-0.1.5.orig/data/xfce/xfce-education.directory.in garcon-0.1.5/data/xfce/xfce-education.directory.in
+--- garcon-0.1.5.orig/data/xfce/xfce-education.directory.in 2011-01-16 14:27:39.000000000 +0100
++++ garcon-0.1.5/data/xfce/xfce-education.directory.in 1970-01-01 01:00:00.000000000 +0100
+@@ -1,6 +0,0 @@
+-[Desktop Entry]
+-Version=1.0
+-Type=Directory
+-Icon=applications-education
+-_Name=Education
+-_Comment=Educational software
+diff -Nur garcon-0.1.5.orig/data/xfce/xfce-games.directory.in garcon-0.1.5/data/xfce/xfce-games.directory.in
+--- garcon-0.1.5.orig/data/xfce/xfce-games.directory.in 2011-01-16 14:27:39.000000000 +0100
++++ garcon-0.1.5/data/xfce/xfce-games.directory.in 1970-01-01 01:00:00.000000000 +0100
+@@ -1,6 +0,0 @@
+-[Desktop Entry]
+-Version=1.0
+-Type=Directory
+-Icon=applications-games
+-_Name=Games
+-_Comment=Games, puzzles, and other fun software
+diff -Nur garcon-0.1.5.orig/data/xfce/xfce-graphics.directory.in garcon-0.1.5/data/xfce/xfce-graphics.directory.in
+--- garcon-0.1.5.orig/data/xfce/xfce-graphics.directory.in 2011-01-16 14:27:39.000000000 +0100
++++ garcon-0.1.5/data/xfce/xfce-graphics.directory.in 1970-01-01 01:00:00.000000000 +0100
+@@ -1,6 +0,0 @@
+-[Desktop Entry]
+-Version=1.0
+-Type=Directory
+-Icon=applications-graphics
+-_Name=Graphics
+-_Comment=Graphics creation and manipulation applications
+diff -Nur garcon-0.1.5.orig/data/xfce/xfce-multimedia.directory.in garcon-0.1.5/data/xfce/xfce-multimedia.directory.in
+--- garcon-0.1.5.orig/data/xfce/xfce-multimedia.directory.in 2011-01-16 14:27:39.000000000 +0100
++++ garcon-0.1.5/data/xfce/xfce-multimedia.directory.in 1970-01-01 01:00:00.000000000 +0100
+@@ -1,6 +0,0 @@
+-[Desktop Entry]
+-Version=1.0
+-Type=Directory
+-Icon=applications-multimedia
+-_Name=Multimedia
+-_Comment=Audio and video players and editors
+diff -Nur garcon-0.1.5.orig/data/xfce/xfce-network.directory.in garcon-0.1.5/data/xfce/xfce-network.directory.in
+--- garcon-0.1.5.orig/data/xfce/xfce-network.directory.in 2011-01-16 14:27:39.000000000 +0100
++++ garcon-0.1.5/data/xfce/xfce-network.directory.in 1970-01-01 01:00:00.000000000 +0100
+@@ -1,6 +0,0 @@
+-[Desktop Entry]
+-Version=1.0
+-Type=Directory
+-Icon=applications-internet
+-_Name=Network
+-_Comment=Network applications and utilities
+diff -Nur garcon-0.1.5.orig/data/xfce/xfce-office.directory.in garcon-0.1.5/data/xfce/xfce-office.directory.in
+--- garcon-0.1.5.orig/data/xfce/xfce-office.directory.in 2011-01-16 14:27:39.000000000 +0100
++++ garcon-0.1.5/data/xfce/xfce-office.directory.in 1970-01-01 01:00:00.000000000 +0100
+@@ -1,6 +0,0 @@
+-[Desktop Entry]
+-Version=1.0
+-Type=Directory
+-Icon=applications-office
+-_Name=Office
+-_Comment=Office and productivity applications
+diff -Nur garcon-0.1.5.orig/data/xfce/xfce-science.directory.in garcon-0.1.5/data/xfce/xfce-science.directory.in
+--- garcon-0.1.5.orig/data/xfce/xfce-science.directory.in 2011-01-16 14:27:39.000000000 +0100
++++ garcon-0.1.5/data/xfce/xfce-science.directory.in 1970-01-01 01:00:00.000000000 +0100
+@@ -1,6 +0,0 @@
+-[Desktop Entry]
+-Version=1.0
+-Type=Directory
+-Icon=applications-science
+-_Name=Science
+-_Comment=Scientific software
+diff -Nur garcon-0.1.5.orig/data/xfce/xfce-screensavers.directory.in garcon-0.1.5/data/xfce/xfce-screensavers.directory.in
+--- garcon-0.1.5.orig/data/xfce/xfce-screensavers.directory.in 2011-01-16 14:27:39.000000000 +0100
++++ garcon-0.1.5/data/xfce/xfce-screensavers.directory.in 1970-01-01 01:00:00.000000000 +0100
+@@ -1,6 +0,0 @@
+-[Desktop Entry]
+-Version=1.0
+-Type=Directory
+-Icon=preferences-desktop-screensaver
+-_Name=Screensavers
+-_Comment=Screensaver applets
+diff -Nur garcon-0.1.5.orig/data/xfce/xfce-settings.directory.in garcon-0.1.5/data/xfce/xfce-settings.directory.in
+--- garcon-0.1.5.orig/data/xfce/xfce-settings.directory.in 2011-01-16 14:27:39.000000000 +0100
++++ garcon-0.1.5/data/xfce/xfce-settings.directory.in 1970-01-01 01:00:00.000000000 +0100
+@@ -1,6 +0,0 @@
+-[Desktop Entry]
+-Version=1.0
+-Type=Directory
+-Icon=preferences-desktop
+-_Name=Settings
+-_Comment=Desktop and system settings applications
+diff -Nur garcon-0.1.5.orig/data/xfce/xfce-system.directory.in garcon-0.1.5/data/xfce/xfce-system.directory.in
+--- garcon-0.1.5.orig/data/xfce/xfce-system.directory.in 2011-01-16 14:27:39.000000000 +0100
++++ garcon-0.1.5/data/xfce/xfce-system.directory.in 1970-01-01 01:00:00.000000000 +0100
+@@ -1,6 +0,0 @@
+-[Desktop Entry]
+-Version=1.0
+-Type=Directory
+-Icon=applications-system
+-_Name=System
+-_Comment=System tools and utilities
diff --git a/garcon.spec b/garcon.spec
index 3d67862..be92972 100644
--- a/garcon.spec
+++ b/garcon.spec
@@ -11,7 +11,7 @@ Group: System Environment/Libraries
License: LGPLv2+ and GFDL
URL: http://xfce.org/
Source0: http://archive.xfce.org/src/libs/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2
-Patch0: garcon-0.1.3-redhat-menus.patch
+Patch0: garcon-0.1.5-redhat-menus.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: glib2-devel >= 2.14
@@ -48,7 +48,7 @@ developing applications that use %{name}.
%prep
%setup -q
-#patch0 -p1 -b.redhat-menus
+%patch0 -p1 -b.redhat-menus
%build
@@ -77,19 +77,6 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/xdg/menus/xfce-applications.menu
%{_libdir}/*.so.*
%{_datadir}/desktop-directories/xfce-other.directory
-# Remove these when the redhat menus patch is rebased
-%{_datadir}/desktop-directories/xfce-accessories.directory
-%{_datadir}/desktop-directories/xfce-development.directory
-%{_datadir}/desktop-directories/xfce-education.directory
-%{_datadir}/desktop-directories/xfce-games.directory
-%{_datadir}/desktop-directories/xfce-graphics.directory
-%{_datadir}/desktop-directories/xfce-multimedia.directory
-%{_datadir}/desktop-directories/xfce-network.directory
-%{_datadir}/desktop-directories/xfce-office.directory
-%{_datadir}/desktop-directories/xfce-science.directory
-%{_datadir}/desktop-directories/xfce-screensavers.directory
-%{_datadir}/desktop-directories/xfce-settings.directory
-%{_datadir}/desktop-directories/xfce-system.directory
%files devel
%defattr(-,root,root,-)
@@ -100,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_datadir}/gtk-doc/
%changelog
+* Mon Jan 17 2011 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.5-2
+- Include rebased redhat-menus.patch
+
* Sun Jan 16 2011 Kevin Fenzi <kevin at tummy.com> - 0.1.5-1
- Update to 0.1.5
More information about the scm-commits
mailing list