[garcon] Update to 0.1.8
Christoph Wickert
cwickert at fedoraproject.org
Sun Jun 19 18:19:31 UTC 2011
commit 9c73ceb101aca77055fc1241a8c4619df4e5154b
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date: Sun Jun 19 20:19:18 2011 +0200
Update to 0.1.8
.gitignore | 1 +
...-menus.patch => garcon-0.1.8-redhat-menus.patch | 120 ++++++++------------
garcon.spec | 7 +-
sources | 2 +-
4 files changed, 57 insertions(+), 73 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6fdca7f..2a3c41b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ garcon-0.1.1.tar.bz2
/garcon-0.1.5.tar.bz2
/garcon-0.1.6.tar.bz2
/garcon-0.1.7.tar.bz2
+/garcon-0.1.8.tar.bz2
diff --git a/garcon-0.1.5-redhat-menus.patch b/garcon-0.1.8-redhat-menus.patch
similarity index 66%
rename from garcon-0.1.5-redhat-menus.patch
rename to garcon-0.1.8-redhat-menus.patch
index bcdcf07..51f4fb6 100644
--- a/garcon-0.1.5-redhat-menus.patch
+++ b/garcon-0.1.8-redhat-menus.patch
@@ -1,7 +1,7 @@
-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-03-29 15:02:04.545960984 +0200
-@@ -23,19 +23,8 @@
+diff -Nur garcon-0.1.8.orig/data/xfce/Makefile.am garcon-0.1.8/data/xfce/Makefile.am
+--- garcon-0.1.8.orig/data/xfce/Makefile.am 2011-06-19 15:35:09.000000000 +0200
++++ garcon-0.1.8/data/xfce/Makefile.am 2011-06-19 20:06:21.330941194 +0200
+@@ -23,18 +23,8 @@
directorydir = $(datadir)/desktop-directories
directory_in_files = \
@@ -14,7 +14,6 @@ diff -Nur garcon-0.1.5.orig/data/xfce/Makefile.am garcon-0.1.5/data/xfce/Makefil
- 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
@@ -22,10 +21,10 @@ diff -Nur garcon-0.1.5.orig/data/xfce/Makefile.am garcon-0.1.5/data/xfce/Makefil
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-03-29 15:02:04.546961129 +0200
-@@ -274,19 +274,8 @@
+diff -Nur garcon-0.1.8.orig/data/xfce/Makefile.in garcon-0.1.8/data/xfce/Makefile.in
+--- garcon-0.1.8.orig/data/xfce/Makefile.in 2011-06-19 15:35:14.000000000 +0200
++++ garcon-0.1.8/data/xfce/Makefile.in 2011-06-19 20:06:55.899119004 +0200
+@@ -277,18 +277,8 @@
directorydir = $(datadir)/desktop-directories
directory_in_files = \
@@ -38,7 +37,6 @@ diff -Nur garcon-0.1.5.orig/data/xfce/Makefile.in garcon-0.1.5/data/xfce/Makefil
- 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
@@ -46,9 +44,9 @@ diff -Nur garcon-0.1.5.orig/data/xfce/Makefile.in garcon-0.1.5/data/xfce/Makefil
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
+diff -Nur garcon-0.1.8.orig/data/xfce/xfce-accessories.directory.in garcon-0.1.8/data/xfce/xfce-accessories.directory.in
+--- garcon-0.1.8.orig/data/xfce/xfce-accessories.directory.in 2011-06-19 15:35:09.000000000 +0200
++++ garcon-0.1.8/data/xfce/xfce-accessories.directory.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Version=1.0
@@ -56,10 +54,10 @@ diff -Nur garcon-0.1.5.orig/data/xfce/xfce-accessories.directory.in garcon-0.1.5
-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-03-29 16:39:04.041601064 +0200
-@@ -19,20 +19,25 @@
+diff -Nur garcon-0.1.8.orig/data/xfce/xfce-applications.menu garcon-0.1.8/data/xfce/xfce-applications.menu
+--- garcon-0.1.8.orig/data/xfce/xfce-applications.menu 2011-06-19 15:35:09.000000000 +0200
++++ garcon-0.1.8/data/xfce/xfce-applications.menu 2011-06-19 20:09:20.403941918 +0200
+@@ -20,20 +20,25 @@
<Filename>exo-mail-reader.desktop</Filename>
<Filename>exo-web-browser.desktop</Filename>
<Separator/>
@@ -90,7 +88,7 @@ diff -Nur garcon-0.1.5.orig/data/xfce/xfce-applications.menu garcon-0.1.5/data/x
</Include>
<Layout>
-@@ -41,25 +46,31 @@
+@@ -42,25 +47,31 @@
<Merge type="all"/>
</Layout>
@@ -135,7 +133,7 @@ diff -Nur garcon-0.1.5.orig/data/xfce/xfce-applications.menu garcon-0.1.5/data/x
</Include>
<Exclude>
<Or>
-@@ -73,23 +84,34 @@
+@@ -74,23 +85,34 @@
<Menu>
<Name>Development</Name>
@@ -173,7 +171,7 @@ diff -Nur garcon-0.1.5.orig/data/xfce/xfce-applications.menu garcon-0.1.5/data/x
<Include>
<Category>Game</Category>
</Include>
-@@ -97,7 +119,7 @@
+@@ -98,7 +120,7 @@
<Menu>
<Name>Graphics</Name>
@@ -182,7 +180,7 @@ diff -Nur garcon-0.1.5.orig/data/xfce/xfce-applications.menu garcon-0.1.5/data/x
<Include>
<Category>Graphics</Category>
</Include>
-@@ -105,7 +127,7 @@
+@@ -106,7 +128,7 @@
<Menu>
<Name>Multimedia</Name>
@@ -191,7 +189,7 @@ diff -Nur garcon-0.1.5.orig/data/xfce/xfce-applications.menu garcon-0.1.5/data/x
<Include>
<Category>Audio</Category>
<Category>Video</Category>
-@@ -115,7 +137,7 @@
+@@ -116,7 +138,7 @@
<Menu>
<Name>Network</Name>
@@ -200,7 +198,7 @@ diff -Nur garcon-0.1.5.orig/data/xfce/xfce-applications.menu garcon-0.1.5/data/x
<Include>
<Category>Network</Category>
</Include>
-@@ -129,28 +151,26 @@
+@@ -130,7 +152,7 @@
<Menu>
<Name>Office</Name>
@@ -209,17 +207,9 @@ diff -Nur garcon-0.1.5.orig/data/xfce/xfce-applications.menu garcon-0.1.5/data/x
<Include>
<Category>Office</Category>
</Include>
- </Menu>
+@@ -138,12 +160,18 @@
<Menu>
-- <Name>Science</Name>
-- <Directory>xfce-science.directory</Directory>
-- <Include>
-- <Category>Science</Category>
-- </Include>
-- </Menu>
--
-- <Menu>
<Name>System</Name>
- <Directory>xfce-system.directory</Directory>
+ <Directory>System.directory</Directory>
@@ -241,7 +231,7 @@ diff -Nur garcon-0.1.5.orig/data/xfce/xfce-applications.menu garcon-0.1.5/data/x
</Include>
<Exclude>
<Or>
-@@ -164,7 +184,13 @@
+@@ -157,7 +185,13 @@
<Directory>xfce-other.directory</Directory>
<OnlyUnallocated/>
<Include>
@@ -256,9 +246,9 @@ diff -Nur garcon-0.1.5.orig/data/xfce/xfce-applications.menu garcon-0.1.5/data/x
</Include>
</Menu>
-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
+diff -Nur garcon-0.1.8.orig/data/xfce/xfce-development.directory.in garcon-0.1.8/data/xfce/xfce-development.directory.in
+--- garcon-0.1.8.orig/data/xfce/xfce-development.directory.in 2011-06-19 15:35:09.000000000 +0200
++++ garcon-0.1.8/data/xfce/xfce-development.directory.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Version=1.0
@@ -266,9 +256,9 @@ diff -Nur garcon-0.1.5.orig/data/xfce/xfce-development.directory.in garcon-0.1.5
-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
+diff -Nur garcon-0.1.8.orig/data/xfce/xfce-education.directory.in garcon-0.1.8/data/xfce/xfce-education.directory.in
+--- garcon-0.1.8.orig/data/xfce/xfce-education.directory.in 2011-06-19 15:35:09.000000000 +0200
++++ garcon-0.1.8/data/xfce/xfce-education.directory.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Version=1.0
@@ -276,9 +266,9 @@ diff -Nur garcon-0.1.5.orig/data/xfce/xfce-education.directory.in garcon-0.1.5/d
-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
+diff -Nur garcon-0.1.8.orig/data/xfce/xfce-games.directory.in garcon-0.1.8/data/xfce/xfce-games.directory.in
+--- garcon-0.1.8.orig/data/xfce/xfce-games.directory.in 2011-06-19 15:35:09.000000000 +0200
++++ garcon-0.1.8/data/xfce/xfce-games.directory.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Version=1.0
@@ -286,9 +276,9 @@ diff -Nur garcon-0.1.5.orig/data/xfce/xfce-games.directory.in garcon-0.1.5/data/
-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
+diff -Nur garcon-0.1.8.orig/data/xfce/xfce-graphics.directory.in garcon-0.1.8/data/xfce/xfce-graphics.directory.in
+--- garcon-0.1.8.orig/data/xfce/xfce-graphics.directory.in 2011-06-19 15:35:09.000000000 +0200
++++ garcon-0.1.8/data/xfce/xfce-graphics.directory.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Version=1.0
@@ -296,9 +286,9 @@ diff -Nur garcon-0.1.5.orig/data/xfce/xfce-graphics.directory.in garcon-0.1.5/da
-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
+diff -Nur garcon-0.1.8.orig/data/xfce/xfce-multimedia.directory.in garcon-0.1.8/data/xfce/xfce-multimedia.directory.in
+--- garcon-0.1.8.orig/data/xfce/xfce-multimedia.directory.in 2011-06-19 15:35:09.000000000 +0200
++++ garcon-0.1.8/data/xfce/xfce-multimedia.directory.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Version=1.0
@@ -306,9 +296,9 @@ diff -Nur garcon-0.1.5.orig/data/xfce/xfce-multimedia.directory.in garcon-0.1.5/
-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
+diff -Nur garcon-0.1.8.orig/data/xfce/xfce-network.directory.in garcon-0.1.8/data/xfce/xfce-network.directory.in
+--- garcon-0.1.8.orig/data/xfce/xfce-network.directory.in 2011-06-19 15:35:09.000000000 +0200
++++ garcon-0.1.8/data/xfce/xfce-network.directory.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Version=1.0
@@ -316,9 +306,9 @@ diff -Nur garcon-0.1.5.orig/data/xfce/xfce-network.directory.in garcon-0.1.5/dat
-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
+diff -Nur garcon-0.1.8.orig/data/xfce/xfce-office.directory.in garcon-0.1.8/data/xfce/xfce-office.directory.in
+--- garcon-0.1.8.orig/data/xfce/xfce-office.directory.in 2011-06-19 15:35:09.000000000 +0200
++++ garcon-0.1.8/data/xfce/xfce-office.directory.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Version=1.0
@@ -326,19 +316,9 @@ diff -Nur garcon-0.1.5.orig/data/xfce/xfce-office.directory.in garcon-0.1.5/data
-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
+diff -Nur garcon-0.1.8.orig/data/xfce/xfce-screensavers.directory.in garcon-0.1.8/data/xfce/xfce-screensavers.directory.in
+--- garcon-0.1.8.orig/data/xfce/xfce-screensavers.directory.in 2011-06-19 15:35:09.000000000 +0200
++++ garcon-0.1.8/data/xfce/xfce-screensavers.directory.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Version=1.0
@@ -346,9 +326,9 @@ diff -Nur garcon-0.1.5.orig/data/xfce/xfce-screensavers.directory.in garcon-0.1.
-Icon=preferences-desktop-screensaver
-_Name=Screensavers
-_Comment=Screensaver applets
-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
+diff -Nur garcon-0.1.8.orig/data/xfce/xfce-system.directory.in garcon-0.1.8/data/xfce/xfce-system.directory.in
+--- garcon-0.1.8.orig/data/xfce/xfce-system.directory.in 2011-06-19 15:35:09.000000000 +0200
++++ garcon-0.1.8/data/xfce/xfce-system.directory.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Version=1.0
diff --git a/garcon.spec b/garcon.spec
index 142f317..896b7a2 100644
--- a/garcon.spec
+++ b/garcon.spec
@@ -3,7 +3,7 @@
%global minorversion 0.1
Name: garcon
-Version: 0.1.7
+Version: 0.1.8
Release: 1%{?dist}
Summary: Implementation of the freedesktop.org menu specification
@@ -13,7 +13,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.5-redhat-menus.patch
+Patch0: garcon-0.1.8-redhat-menus.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: glib2-devel >= 2.14
@@ -92,6 +92,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%doc %{_datadir}/gtk-doc/
%changelog
+* Sun Jun 20 2011 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.8-1
+- Update to 0.1.8
+
* Thu May 05 2011 Christoph Wickert <wickert at kolabsys.com> - 0.1.7-1
- Update to 0.1.7
- Fix redhat-menus.patch to include all icons
diff --git a/sources b/sources
index 6714ee5..be664a2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8990668e4f2fecffe124f613b6e1e01f garcon-0.1.7.tar.bz2
+18fbf523ed2865dfaccdfb40b4b20b05 garcon-0.1.8.tar.bz2
More information about the scm-commits
mailing list