Accepting request 201976 from GNOME:Factory

Update to 3.10.0 (forwarded request 201956 from RBrownCCB)

OBS-URL: https://build.opensuse.org/request/show/201976
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-menus?expand=0&rev=91
This commit is contained in:
Tomáš Chvátal 2013-10-03 13:47:23 +00:00 committed by Git OBS Bridge
commit 081443504f
5 changed files with 15 additions and 49 deletions

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:713a58ff9e3264be70dd233c2935cfce4ee76223c17044ecbf6cb53eba875192
size 400060

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:33c215ae8d815f4a94d2dbfc8c6679fddbbf8026d30da55a350e67ea940ce14f
size 420556

View File

@ -1,41 +0,0 @@
From 599c7b05c432b1571a7105f1ebf6bbe30c36dbdf Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Thu, 28 Mar 2013 21:54:34 +0000
Subject: 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
---
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 -->
--
cgit v0.9.2

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Oct 2 20:42:44 UTC 2013 - dimstar@opensuse.org
- Update to version 3.10.0:
+ Correct name of gnome-calculator.
+ Fix issues with apps incorrectly showing up in Other.
+ Updated translations.
- Drop gnome-menus-gcalctool-desktop-file-rename.patch: fixed
upstream.
-------------------------------------------------------------------
Sat Sep 21 14:48:50 UTC 2013 - dimstar@opensuse.org

View File

@ -17,16 +17,14 @@
Name: gnome-menus
Version: 3.8.0
Version: 3.10.0
Release: 0
Summary: The GNOME Desktop Menu
License: LGPL-2.1+
Group: System/GUI/GNOME
Url: http://www.gnome.org
Source: http://download.gnome.org/sources/gnome-menus/3.8/%{name}-%{version}.tar.xz
Source: http://download.gnome.org/sources/gnome-menus/3.10/%{name}-%{version}.tar.xz
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM gnome-menus-gcalctool-desktop-file-rename.patch bgo#696816,bnc#841097 malcolmlewis@opensuse.org -- Adapt gnome-calculator.desktop back to gcalctool.desktop, changed at the very last minute before the 3.8.0 release.
Patch0: gnome-menus-gcalctool-desktop-file-rename.patch
BuildRequires: fdupes
BuildRequires: gobject-introspection-devel
BuildRequires: intltool
@ -109,7 +107,6 @@ http://www.freedesktop.org/Standards/menu-spec
%lang_package
%prep
%setup -q
%patch0 -p1
translation-update-upstream
%build