From f1a413cbf437c2d115070e9f80a4e7edfe5a81f40a1aeecc29c2a4722a237418 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Sat, 7 Sep 2013 13:18:41 +0000
Subject: [PATCH] Accepting request 197269 from
 home:dimstar:branches:GNOME:Factory

Update to 3.9.91

OBS-URL: https://build.opensuse.org/request/show/197269
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-clocks?expand=0&rev=25
---
 gnome-clocks-3.9.90.tar.xz |  3 ---
 gnome-clocks-3.9.91.tar.xz |  3 +++
 gnome-clocks.changes       | 11 +++++++++++
 gnome-clocks.gresource.xml | 15 ---------------
 gnome-clocks.spec          | 13 ++++---------
 5 files changed, 18 insertions(+), 27 deletions(-)
 delete mode 100644 gnome-clocks-3.9.90.tar.xz
 create mode 100644 gnome-clocks-3.9.91.tar.xz
 delete mode 100644 gnome-clocks.gresource.xml

diff --git a/gnome-clocks-3.9.90.tar.xz b/gnome-clocks-3.9.90.tar.xz
deleted file mode 100644
index d531759..0000000
--- a/gnome-clocks-3.9.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:09119e14980101a56eb48e064a1169753d24188d8f297470bd1d18b2a0f09b93
-size 779808
diff --git a/gnome-clocks-3.9.91.tar.xz b/gnome-clocks-3.9.91.tar.xz
new file mode 100644
index 0000000..43b12dd
--- /dev/null
+++ b/gnome-clocks-3.9.91.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:855a328b0cf952e4162fd76f94fc64eabae0ab262795fb5e859aeb63d6bd5ac5
+size 775076
diff --git a/gnome-clocks.changes b/gnome-clocks.changes
index c3fc074..c8671f0 100644
--- a/gnome-clocks.changes
+++ b/gnome-clocks.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Sep  3 06:41:43 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 3.9.91:
+  + Tweak some details of the new ui.
+  + Add an appdata file for gnome-software.
+  + Misc bugfixes.
+  + Updated translations.
+- Remvoe gnome-clocks.gresource.xml source: it's now included in
+  the tarball.
+
 -------------------------------------------------------------------
 Mon Aug 19 21:13:21 UTC 2013 - dimstar@opensuse.org
 
diff --git a/gnome-clocks.gresource.xml b/gnome-clocks.gresource.xml
deleted file mode 100644
index 3937d32..0000000
--- a/gnome-clocks.gresource.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gnome/clocks">
-    <file>css/gnome-clocks.css</file>
-    <file preprocess="xml-stripblanks">ui/menu.ui</file>
-    <file preprocess="xml-stripblanks">ui/window.ui</file>
-    <file preprocess="xml-stripblanks">ui/worldlocationdialog.ui</file>
-    <file preprocess="xml-stripblanks">ui/world.ui</file>
-    <file preprocess="xml-stripblanks">ui/alarm.ui</file>
-    <file preprocess="xml-stripblanks">ui/alarmsetupdialog.ui</file>
-    <file preprocess="xml-stripblanks">ui/stopwatch.ui</file>
-    <file preprocess="xml-stripblanks">ui/stopwatchlapsrow.ui</file>
-    <file preprocess="xml-stripblanks">ui/timer.ui</file>
-  </gresource>
-</gresources>
diff --git a/gnome-clocks.spec b/gnome-clocks.spec
index 2eaaa4a..c8e8d88 100644
--- a/gnome-clocks.spec
+++ b/gnome-clocks.spec
@@ -18,15 +18,13 @@
 
 
 Name:           gnome-clocks
-Version:        3.9.90
+Version:        3.9.91
 Release:        0
 Summary:        Clock application designed for GNOME 3
 License:        GPL-2.0+
 Group:          Productivity/Office/Other
 Url:            https://live.gnome.org/Design/Apps/Clock
 Source:         http://download.gnome.org/sources/gnome-clocks/3.9/%{name}-%{version}.tar.xz
-# Add missing gnome-clocks.gresource.xml. Next tarball should have it.
-Source1:        gnome-clocks.gresource.xml
 # For icont_theme_chache post and postun macros
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  intltool >= 0.40
@@ -37,7 +35,7 @@ BuildRequires:  pkgconfig(gio-2.0) >= 2.30.0
 BuildRequires:  pkgconfig(gnome-desktop-3.0) >= 3.7.90
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.9.11
-BuildRequires:  pkgconfig(gweather-3.0) >= 3.9.3
+BuildRequires:  pkgconfig(gweather-3.0) >= 3.9.91
 BuildRequires:  pkgconfig(libcanberra) >= 0.30
 BuildRequires:  pkgconfig(libnotify) >= 0.7.0
 Recommends:     %{name}-lang
@@ -50,11 +48,6 @@ A nice simple app to show the time, date, and alarms.
 %lang_package
 %prep
 %setup -q
-# gnome-clocks 3.9.90 is missing data/gnome-clocks.gresource.xml in the tarball. Fail if it's
-# now present of add the one which is added as source.
-test ! -f data/gnome-clocks.gresource.xml
-cp %{S:1} data/gnome-clocks.gresource.xml
-# End fixup
 translation-update-upstream
 
 %build
@@ -82,6 +75,8 @@ translation-update-upstream
 %doc README COPYING
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
+%dir %{_datadir}/appdata
+%{_datadir}/appdata/gnome-clocks.appdata.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.clocks.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/gnome-clocks.*
 %{_datadir}/icons/HighContrast/