From 4f9560db5d3608597fad46001656a1fc2930e999 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 22 Feb 2013 08:05:30 +0100 Subject: [PATCH] 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). --- .gitignore | 1 + gnome-menus.spec | 27 +++++++-------------------- other-docs.patch | 11 ----------- sources | 2 +- 4 files changed, 9 insertions(+), 32 deletions(-) delete mode 100644 other-docs.patch diff --git a/.gitignore b/.gitignore index 1f67bbd..687b512 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/gnome-menus.spec b/gnome-menus.spec index dd4f1df..416bb45 100644 --- a/gnome-menus.spec +++ b/gnome-menus.spec @@ -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 - 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 - 3.6.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/other-docs.patch b/other-docs.patch deleted file mode 100644 index 896e016..0000000 --- a/other-docs.patch +++ /dev/null @@ -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 @@ - Core - Screensaver - X-GNOME-Settings-Panel -+ Documentation - - - diff --git a/sources b/sources index 64a0a08..29c2f28 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c48775f704e7c542496d1fa1a84b2bfd gnome-menus-3.6.2.tar.xz +efbdfeb9022fc589b0f59659f3062f73 gnome-menus-3.7.90.tar.xz