From 21d8658486a09b5ee8a6fcd75a03ffcbb7836204 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 11 Apr 2011 13:29:50 -0400 Subject: [PATCH] Ship applications-gnome.menu --- gnome-menus.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gnome-menus.spec b/gnome-menus.spec index bf8c834..16c4e1c 100644 --- a/gnome-menus.spec +++ b/gnome-menus.spec @@ -3,7 +3,7 @@ Summary: A menu system for the GNOME project Name: gnome-menus Version: 3.0.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gnome.org/ @@ -42,6 +42,7 @@ writing applications that use the GNOME menu system. %build %configure --disable-static \ + --disable-introspection \ %if %{enable_debugging} --enable-debug=yes %else @@ -59,8 +60,9 @@ make %{?_smp_mflags} make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' -rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus -rm -rf $RPM_BUILD_ROOT%{_datadir}/desktop-directories/Desktop.directory +# This probably dates back to Bluecurve days; rather than simply deleting +# deleting it, we'll ship it as applications-gnome.desktop +mv $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/applications{,-gnome}.menu # We use alacarte now rm -rf $RPM_BUILD_ROOT%{_bindir}/gmenu-simple-editor @@ -81,6 +83,7 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-menus/ %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS NEWS COPYING.LIB +%{_sysconfdir}/xdg/menus/applications-gnome.menu %{_libdir}/libgnome-menu.so.* %{python_sitearch}/gmenu.so %{_datadir}/desktop-directories/* @@ -92,6 +95,10 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-menus/ %{_includedir}/gnome-menus %changelog +* Mon Apr 11 2011 Colin Walters - 3.0.0-2 +- Ship applications-gnome.desktop; we don't want GNOME 3 to use redhat-menus. +- Disable introspection, we're not using it right now + * Mon Apr 4 2011 Matthias Clasen 3.0.0-1 - Update to 3.0.0