Use gnome-applications.menu instead of applications-gnome.menu

This will allow us to use XDG_MENU_PREFIX instead of a downstream
patch to gnome-shell.
This commit is contained in:
Florian Müllner 2012-10-18 16:05:12 +02:00
parent 8e32c2f5af
commit ff33278876

View File

@ -3,7 +3,7 @@
Summary: A menu system for the GNOME project
Name: gnome-menus
Version: 3.6.0
Release: 1%{?dist}
Release: 2%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.gnome.org/
@ -59,8 +59,8 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
# 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
# deleting it, we'll ship it as gnome-applications.desktop
mv $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/{,gnome-}applications.menu
# We use alacarte now
rm -rf $RPM_BUILD_ROOT%{_bindir}/gmenu-simple-editor
@ -80,7 +80,7 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-menus/
%files -f gnome-menus-3.0.lang
%doc AUTHORS NEWS COPYING.LIB
%{_sysconfdir}/xdg/menus/applications-gnome.menu
%{_sysconfdir}/xdg/menus/gnome-applications.menu
%{_libdir}/lib*.so.*
%{_datadir}/desktop-directories/*
%{_libdir}/girepository-1.0/GMenu-3.0.typelib
@ -92,6 +92,11 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-menus/
%{_datadir}/gir-1.0/GMenu-3.0.gir
%changelog
* Thu Oct 18 2012 Florian Müllner <fmuellner@redhat.com> - 3.6.0-2
- Use gnome-applications.menu instead of applications-gnome.menu,
in order to be able to use XDG_MENU_PREFIX instead of a downstream
patch to gnome-shell
* Tue Sep 25 2012 Matthias Clasen <mclasen@redhat.com> - 3.6.0-1
- Update to 3.6.0