Update to 3.10.1

This commit is contained in:
Richard Hughes 2013-10-29 08:27:46 +00:00
parent c7428d8249
commit ada2b6749d
4 changed files with 8 additions and 52 deletions

1
.gitignore vendored
View File

@ -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.1.tar.xz

View File

@ -1,45 +0,0 @@
From 599c7b05c432b1571a7105f1ebf6bbe30c36dbdf Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
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 @@
<Not><Filename>file-roller.desktop</Filename></Not>
<Not><Filename>gnome-file-roller.desktop</Filename></Not>
<Not><Filename>deja-dup-preferences.desktop</Filename></Not>
- <Not><Filename>gnome-calculator.desktop</Filename></Not>
<Not><Filename>gcalctool.desktop</Filename></Not>
<Not><Filename>gucharmap.desktop</Filename></Not>
<Not><Filename>gnome-gucharmap.desktop</Filename></Not>
@@ -251,7 +250,7 @@
<Directory>X-GNOME-Utilities.directory</Directory>
<Include>
<Filename>file-roller.desktop</Filename>
- <Filename>gnome-calculator.desktop</Filename>
+ <Filename>gcalctool.desktop</Filename>
<Filename>gnome-font-viewer.desktop</Filename>
<Filename>gucharmap.desktop</Filename>
<Filename>seahorse.desktop</Filename>
@@ -287,7 +286,6 @@
<Not><Filename>gnome-eog.desktop</Filename></Not>
<Not><Filename>gnome-file-roller.desktop</Filename></Not>
<Not><Filename>gnome-gucharmap.desktop</Filename></Not>
- <Not><Filename>gcalctool.desktop</Filename></Not>
</And>
</Include>
</Menu> <!-- End Other -->
--
1.8.2

View File

@ -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.1
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
* Tue Oct 29 2013 Richard Hughes <rhughes@redhat.com> - 3.10.1-1
- Update to 3.10.1
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.8.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

View File

@ -1 +1 @@
c1bf2752f3b8e2d0c1e519cc69441450 gnome-menus-3.8.0.tar.xz
6db025e79e2b69f39fc7aa0753f43081 gnome-menus-3.10.1.tar.xz