[garcon] - Update to 0.1.4
Christoph Wickert
cwickert at fedoraproject.org
Sat Jan 8 21:28:11 UTC 2011
commit 0a27d2fbdbcd2c108968c0c4e93d6498b0702d11
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date: Sat Jan 8 22:27:58 2011 +0100
- Update to 0.1.4
.gitignore | 1 +
garcon-0.1.3-redhat-menus.patch | 359 +++++++++++++++++++++++++++++++++++++++
garcon.spec | 40 ++++-
sources | 2 +-
4 files changed, 391 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a035a72..837751a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
garcon-0.1.1.tar.bz2
+/garcon-0.1.2.tar.bz2
diff --git a/garcon-0.1.3-redhat-menus.patch b/garcon-0.1.3-redhat-menus.patch
new file mode 100644
index 0000000..c25de7d
--- /dev/null
+++ b/garcon-0.1.3-redhat-menus.patch
@@ -0,0 +1,359 @@
+diff -Nur garcon-0.1.3.orig/data/xfce/Makefile.am garcon-0.1.3/data/xfce/Makefile.am
+--- garcon-0.1.3.orig/data/xfce/Makefile.am 2010-11-07 11:36:28.000000000 +0100
++++ garcon-0.1.3/data/xfce/Makefile.am 2010-12-04 10:52:35.003760600 +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.3.orig/data/xfce/Makefile.in garcon-0.1.3/data/xfce/Makefile.in
+--- garcon-0.1.3.orig/data/xfce/Makefile.in 2010-11-07 11:36:33.000000000 +0100
++++ garcon-0.1.3/data/xfce/Makefile.in 2010-12-04 10:52:33.667876826 +0100
+@@ -272,20 +272,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.3.orig/data/xfce/xfce-accessories.directory.in garcon-0.1.3/data/xfce/xfce-accessories.directory.in
+--- garcon-0.1.3.orig/data/xfce/xfce-accessories.directory.in 2010-11-07 11:36:28.000000000 +0100
++++ garcon-0.1.3/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.3.orig/data/xfce/xfce-applications.menu garcon-0.1.3/data/xfce/xfce-applications.menu
+--- garcon-0.1.3.orig/data/xfce/xfce-applications.menu 2010-11-07 11:36:28.000000000 +0100
++++ garcon-0.1.3/data/xfce/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>
+@@ -89,7 +112,7 @@
+
+ <Menu>
+ <Name>Graphics</Name>
+- <Directory>xfce-graphics.directory</Directory>
++ <Directory>Graphics.directory</Directory>
+ <Include>
+ <Category>Graphics</Category>
+ </Include>
+@@ -97,7 +120,7 @@
+
+ <Menu>
+ <Name>Multimedia</Name>
+- <Directory>xfce-multimedia.directory</Directory>
++ <Directory>AudioVideo.directory</Directory>
+ <Include>
+ <Category>Audio</Category>
+ <Category>Video</Category>
+@@ -107,7 +130,7 @@
+
+ <Menu>
+ <Name>Network</Name>
+- <Directory>xfce-network.directory</Directory>
++ <Directory>Network.directory</Directory>
+ <Include>
+ <Category>Network</Category>
+ </Include>
+@@ -115,7 +138,7 @@
+
+ <Menu>
+ <Name>Office</Name>
+- <Directory>xfce-office.directory</Directory>
++ <Directory>Office.directory</Directory>
+ <Include>
+ <Category>Office</Category>
+ </Include>
+@@ -131,12 +154,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>
+ </Menu>
+
+@@ -145,7 +172,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.3.orig/data/xfce/xfce-development.directory.in garcon-0.1.3/data/xfce/xfce-development.directory.in
+--- garcon-0.1.3.orig/data/xfce/xfce-development.directory.in 2010-11-07 11:36:28.000000000 +0100
++++ garcon-0.1.3/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.3.orig/data/xfce/xfce-education.directory.in garcon-0.1.3/data/xfce/xfce-education.directory.in
+--- garcon-0.1.3.orig/data/xfce/xfce-education.directory.in 2010-11-07 11:36:28.000000000 +0100
++++ garcon-0.1.3/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.3.orig/data/xfce/xfce-games.directory.in garcon-0.1.3/data/xfce/xfce-games.directory.in
+--- garcon-0.1.3.orig/data/xfce/xfce-games.directory.in 2010-11-07 11:36:28.000000000 +0100
++++ garcon-0.1.3/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.3.orig/data/xfce/xfce-graphics.directory.in garcon-0.1.3/data/xfce/xfce-graphics.directory.in
+--- garcon-0.1.3.orig/data/xfce/xfce-graphics.directory.in 2010-11-07 11:36:28.000000000 +0100
++++ garcon-0.1.3/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.3.orig/data/xfce/xfce-multimedia.directory.in garcon-0.1.3/data/xfce/xfce-multimedia.directory.in
+--- garcon-0.1.3.orig/data/xfce/xfce-multimedia.directory.in 2010-11-07 11:36:28.000000000 +0100
++++ garcon-0.1.3/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.3.orig/data/xfce/xfce-network.directory.in garcon-0.1.3/data/xfce/xfce-network.directory.in
+--- garcon-0.1.3.orig/data/xfce/xfce-network.directory.in 2010-11-07 11:36:28.000000000 +0100
++++ garcon-0.1.3/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.3.orig/data/xfce/xfce-office.directory.in garcon-0.1.3/data/xfce/xfce-office.directory.in
+--- garcon-0.1.3.orig/data/xfce/xfce-office.directory.in 2010-11-07 11:36:28.000000000 +0100
++++ garcon-0.1.3/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.3.orig/data/xfce/xfce-science.directory.in garcon-0.1.3/data/xfce/xfce-science.directory.in
+--- garcon-0.1.3.orig/data/xfce/xfce-science.directory.in 2010-11-07 11:36:28.000000000 +0100
++++ garcon-0.1.3/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.3.orig/data/xfce/xfce-screensavers.directory.in garcon-0.1.3/data/xfce/xfce-screensavers.directory.in
+--- garcon-0.1.3.orig/data/xfce/xfce-screensavers.directory.in 2010-11-07 11:36:28.000000000 +0100
++++ garcon-0.1.3/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.3.orig/data/xfce/xfce-settings.directory.in garcon-0.1.3/data/xfce/xfce-settings.directory.in
+--- garcon-0.1.3.orig/data/xfce/xfce-settings.directory.in 2010-11-07 11:36:28.000000000 +0100
++++ garcon-0.1.3/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.3.orig/data/xfce/xfce-system.directory.in garcon-0.1.3/data/xfce/xfce-system.directory.in
+--- garcon-0.1.3.orig/data/xfce/xfce-system.directory.in 2010-11-07 11:36:28.000000000 +0100
++++ garcon-0.1.3/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 e139ab4..1abdebd 100644
--- a/garcon.spec
+++ b/garcon.spec
@@ -1,6 +1,8 @@
+%global minorversion 0.1
+
Name: garcon
-Version: 0.1.1
-Release: 2%{?dist}
+Version: 0.1.4
+Release: 1%{?dist}
Summary: Implementation of the freedesktop.org menu specification
Group: System Environment/Libraries
@@ -8,7 +10,8 @@ Group: System Environment/Libraries
# while its documentation is licensed under the GFDL 1.1
License: LGPLv2+ and GFDL
URL: http://xfce.org/
-Source0: http://archive.xfce.org/src/libs/%{name}/0.1/%{name}-%{version}.tar.bz2
+Source0: http://archive.xfce.org/src/libs/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2
+Patch0: garcon-0.1.3-redhat-menus.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: glib2-devel >= 2.14
@@ -16,10 +19,12 @@ BuildRequires: gtk2-devel >= 2.12.0
BuildRequires: gtk-doc
BuildRequires: gettext
BuildRequires: intltool
+Requires: redhat-menus
-# not yet in place
-#Provides: libxfce4menu-devel = 4.6.2
-#Obsoletes: libxfce4menu-devel < 4.6.2
+Provides: libxfce4menu = 4.6.2
+Obsoletes: libxfce4menu < 4.6.2
+# because of %%{_datadir}/desktop-directories/xfce-*
+Conflicts: xfdesktop <= 4.6.2
%description
Garcon is an implementation of the freedesktop.org menu specification replacing
@@ -32,9 +37,9 @@ Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: gtk2-devel
Requires: pkgconfig
-# not yet in place
-#Provides: libxfce4menu = 4.6.2
-#Obsoletes: libxfce4menu < 4.6.2
+# FIXME not yet in place
+Provides: libxfce4menu-devel = 4.6.2
+Obsoletes: libxfce4menu-devel < 4.6.2
%description devel
The %{name}-devel package contains libraries and header files for
@@ -43,6 +48,7 @@ developing applications that use %{name}.
%prep
%setup -q
+%patch0 -p1 -b.redhat-menus
%build
@@ -52,7 +58,7 @@ make %{?_smp_mflags} V=1
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%find_lang %{name}
@@ -68,7 +74,9 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
+%config(noreplace) %{_sysconfdir}/xdg/menus/xfce-applications.menu
%{_libdir}/*.so.*
+%{_datadir}/desktop-directories/xfce-other.directory
%files devel
%defattr(-,root,root,-)
@@ -79,6 +87,18 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_datadir}/gtk-doc/
%changelog
+* Sun Dec 05 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.4-1
+- Update to 0.1.4
+
+* Sat Dec 04 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.3-2
+- Add patch to use redhat-menus
+
+* Mon Nov 08 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.3-1
+- Update to 0.1.2
+
+* Wed Nov 03 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.2-1
+- Update to 0.1.2
+
* Thu Oct 07 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-2
- Drop dependency on gtk-doc (#604352)
diff --git a/sources b/sources
index bc038fa..dc10e9f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8f3fb5edd1b42ed15e474206df8b66fa garcon-0.1.1.tar.bz2
+22067b008b6d41c7b70b1608858cdd6d garcon-0.1.2.tar.bz2
More information about the scm-commits
mailing list