From b3364d584ab45229a58b8606fe6b8b0c0a249642 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 30 Mar 2013 16:41:25 +0100 Subject: [PATCH] Fix gnome-calculator to show up in the menus again --- gnome-menus-3.8.0-calculator.patch | 45 ++++++++++++++++++++++++++++++ gnome-menus.spec | 8 +++++- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 gnome-menus-3.8.0-calculator.patch diff --git a/gnome-menus-3.8.0-calculator.patch b/gnome-menus-3.8.0-calculator.patch new file mode 100644 index 0000000..56e45c5 --- /dev/null +++ b/gnome-menus-3.8.0-calculator.patch @@ -0,0 +1,45 @@ +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 d4d7ccf..5da567f 100644 --- a/gnome-menus.spec +++ b/gnome-menus.spec @@ -3,13 +3,15 @@ Summary: A menu system for the GNOME project Name: gnome-menus Version: 3.8.0 -Release: 1%{?dist} +Release: 2%{?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 Requires: redhat-menus BuildRequires: gamin-devel BuildRequires: gawk @@ -38,6 +40,7 @@ writing applications that use the GNOME menu system. %prep %setup -q +%patch0 -p1 -b .calculator %build %configure --disable-static \ @@ -75,6 +78,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_datadir}/gir-1.0/GMenu-3.0.gir %changelog +* Sat Mar 30 2013 Kalev Lember - 3.8.0-2 +- Fix gnome-calculator to show up in the menus again + * Tue Mar 26 2013 Kalev Lember - 3.8.0-1 - Update to 3.8.0