From e3c5b5184aa43ba56f19e41f09924622a170b69c Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Oct 14 2013 14:45:30 +0000 Subject: Update to 3.10.0 --- diff --git a/.gitignore b/.gitignore index d65dc09..b607064 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ gnome-menus-2.30.0.tar.bz2 /gnome-menus-3.6.2.tar.xz /gnome-menus-3.7.90.tar.xz /gnome-menus-3.8.0.tar.xz +/gnome-menus-3.10.0.tar.xz diff --git a/gnome-menus-3.8.0-calculator.patch b/gnome-menus-3.8.0-calculator.patch deleted file mode 100644 index 56e45c5..0000000 --- a/gnome-menus-3.8.0-calculator.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 599c7b05c432b1571a7105f1ebf6bbe30c36dbdf Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Thu, 28 Mar 2013 22:54:34 +0100 -Subject: [PATCH] Adapt for gnome-calculator -> gcalctool desktop file rename - -gnome-calculator.desktop was renamed back to gcalctool.desktop, at the -very last minute before the 3.8.0 release. - -https://bugzilla.gnome.org/show_bug.cgi?id=696816 ---- - layout/gnome-applications.menu | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu -index 84d13ed..503f9ca 100644 ---- a/layout/gnome-applications.menu -+++ b/layout/gnome-applications.menu -@@ -38,7 +38,6 @@ - file-roller.desktop - gnome-file-roller.desktop - deja-dup-preferences.desktop -- gnome-calculator.desktop - gcalctool.desktop - gucharmap.desktop - gnome-gucharmap.desktop -@@ -251,7 +250,7 @@ - X-GNOME-Utilities.directory - - file-roller.desktop -- gnome-calculator.desktop -+ gcalctool.desktop - gnome-font-viewer.desktop - gucharmap.desktop - seahorse.desktop -@@ -287,7 +286,6 @@ - gnome-eog.desktop - gnome-file-roller.desktop - gnome-gucharmap.desktop -- gcalctool.desktop - - - --- -1.8.2 - diff --git a/gnome-menus.spec b/gnome-menus.spec index 57f83fd..daa02e6 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.8.0 -Release: 3%{?dist} +Version: 3.10.0 +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.8/%{name}-%{version}.tar.xz -# https://bugzilla.gnome.org/show_bug.cgi?id=696816 -Patch0: gnome-menus-3.8.0-calculator.patch +Source0: http://download.gnome.org/sources/gnome-menus/3.10/%{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 .calculator %build %configure --disable-static \ @@ -78,6 +75,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gir-1.0/GMenu-3.0.gir %changelog +* Mon Oct 14 2013 Richard Hughes - 3.10.0-1 +- Update to 3.10.0 + * Sat Aug 03 2013 Fedora Release Engineering - 3.8.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 0a8b99f..e616efc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c1bf2752f3b8e2d0c1e519cc69441450 gnome-menus-3.8.0.tar.xz +9cb5e89b8e870647e8115f0a72e37cd3 gnome-menus-3.10.0.tar.xz