Update to 3.7.90

I've also dropped the other-docs.patch which was there to keep release
notes out of Applications>Other. It needs reworking if we want to keep
it and from my quick investigation, fedora-release-notes is trying hard
to work around this patch by shipping a separate desktop file for GNOME
(OnlyShowIn=GNOME).
This commit is contained in:
Kalev Lember 2013-02-22 08:05:30 +01:00
parent 926ceac576
commit 4f9560db5d
4 changed files with 9 additions and 32 deletions

1
.gitignore vendored
View File

@ -20,3 +20,4 @@ gnome-menus-2.30.0.tar.bz2
/gnome-menus-3.6.0.tar.xz
/gnome-menus-3.6.1.tar.xz
/gnome-menus-3.6.2.tar.xz
/gnome-menus-3.7.90.tar.xz

View File

@ -2,16 +2,14 @@
Summary: A menu system for the GNOME project
Name: gnome-menus
Version: 3.6.2
Release: 2%{?dist}
Version: 3.7.90
Release: 1%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.gnome.org/
#VCS: git:git://git.gnome.org/gnome-menus
Source0: http://download.gnome.org/sources/gnome-menus/3.6/%{name}-%{version}.tar.xz
# Keep release notes from showing up in Applications>Other
Patch0: other-docs.patch
Source0: http://download.gnome.org/sources/gnome-menus/3.7/%{name}-%{version}.tar.xz
Requires: redhat-menus
BuildRequires: gamin-devel
BuildRequires: gawk
@ -40,7 +38,6 @@ writing applications that use the GNOME menu system.
%prep
%setup -q
%patch0 -p1 -b .other-docs
%build
%configure --disable-static \
@ -58,20 +55,6 @@ make %{?_smp_mflags}
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 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
rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/gmenu-simple-editor.desktop
rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-menus/glade/gmenu-simple-editor.glade
rm -rf $RPM_BUILD_ROOT%{python_sitearch}/GMenuSimpleEditor/*
# No point in shipping this either
rm -rf $RPM_BUILD_ROOT%{_bindir}/gnome-menu-spec-test
rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-menus/
%find_lang gnome-menus-3.0
%post -p /sbin/ldconfig
@ -92,6 +75,10 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-menus/
%{_datadir}/gir-1.0/GMenu-3.0.gir
%changelog
* Fri Feb 22 2013 Kalev Lember <kalevlember@gmail.com> - 3.7.90-1
- Update to 3.7.90
- Drop the downstream patch for changing the release notes categories
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.6.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

View File

@ -1,11 +0,0 @@
diff -up gnome-menus-3.0.0/layout/applications.menu.other-docs gnome-menus-3.0.0/layout/applications.menu
--- gnome-menus-3.0.0/layout/applications.menu.other-docs 2011-03-31 02:48:41.000000000 -0400
+++ gnome-menus-3.0.0/layout/applications.menu 2011-04-04 19:06:56.826452755 -0400
@@ -147,6 +147,7 @@
<Not><Category>Core</Category></Not>
<Not><Category>Screensaver</Category></Not>
<Not><Category>X-GNOME-Settings-Panel</Category></Not>
+ <Not><Category>Documentation</Category></Not>
</And>
</Include>
</Menu> <!-- End Other -->

View File

@ -1 +1 @@
c48775f704e7c542496d1fa1a84b2bfd gnome-menus-3.6.2.tar.xz
efbdfeb9022fc589b0f59659f3062f73 gnome-menus-3.7.90.tar.xz