From a042889e7026b30bfe0308ce7471bf30b18e2eef Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Sat, 1 Jul 2017 11:11:14 +0300 Subject: [PATCH] Update to 3.25.2 - Drop appdata modification, fixed upstream - Update meson patch --- .gitignore | 1 + gnome-clocks-meson1.patch | 17 ++--------------- gnome-clocks.spec | 21 +++++++-------------- sources | 2 +- 4 files changed, 11 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index dfdf57c..21264fa 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /gnome-clocks-3.23.90.tar.xz /gnome-clocks-3.24.0.tar.xz /gnome-clocks-3.25.1.tar.xz +/gnome-clocks-3.25.2.tar.xz diff --git a/gnome-clocks-meson1.patch b/gnome-clocks-meson1.patch index 7d327cc..a38519f 100644 --- a/gnome-clocks-meson1.patch +++ b/gnome-clocks-meson1.patch @@ -1,21 +1,8 @@ -diff --git a/data/meson.build b/data/meson.build -index 90dafc2..a7dacb0 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -1,6 +1,6 @@ - iconsdir = join_paths(get_option('datadir'), 'icons/hicolor') --foreach size: ['16x16', '22x22', '32x32', '48x48', '256x256', 'scalable'] -- install_subdir('icons/' + size, install_dir: iconsdir) -+foreach size: ['16x16', '22x22', '32x32', '48x48', '256x256', 'symbolic'] -+ install_subdir('icons/hicolor/' + size, install_dir: iconsdir) - endforeach - - install_subdir('images/', install_dir: join_paths(get_option('datadir'), meson.project_name())) diff --git a/help/meson.build b/help/meson.build -index f89afbd..31d389f 100644 +index 654b994..57eef1b 100644 --- a/help/meson.build +++ b/help/meson.build -@@ -39,4 +39,5 @@ gnome.yelp(meson.project_name(), +@@ -41,4 +41,5 @@ gnome.yelp( sources: help_files, media: help_media, languages: help_linguas, diff --git a/gnome-clocks.spec b/gnome-clocks.spec index 05203cd..ebea5e8 100644 --- a/gnome-clocks.spec +++ b/gnome-clocks.spec @@ -1,5 +1,5 @@ Name: gnome-clocks -Version: 3.25.1 +Version: 3.25.2 Release: 1%{?dist} Summary: Clock application designed for GNOME 3 @@ -7,7 +7,7 @@ License: GPLv2+ URL: https://wiki.gnome.org/Apps/Clocks Source0: https://download.gnome.org/sources/gnome-clocks/3.25/%{name}-%{version}.tar.xz -# these are already upstream +# This one got lost in the release Patch0: gnome-clocks-meson1.patch BuildRequires: meson @@ -41,18 +41,6 @@ Clock application designed for GNOME 3 %meson_install %find_lang gnome-clocks --with-gnome -# Update the screenshot shown in the software center -# -# NOTE: It would be *awesome* if this file was pushed upstream. -# -# See http://people.freedesktop.org/~hughsient/appdata/#screenshots for more details. -# -appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/appdata/org.gnome.clocks.appdata.xml \ - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/org.gnome.clocks/a.png \ - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/org.gnome.clocks/b.png \ - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/org.gnome.clocks/c.png \ - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/org.gnome.clocks/d.png \ - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/org.gnome.clocks/e.png %check desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.clocks.desktop @@ -88,6 +76,11 @@ fi %changelog +* Sat Jul 1 2017 Yanko Kaneti - 3.25.2-1 +- Update to 3.25.2 +- Drop appdata modification, fixed upstream +- Update meson patch + * Tue May 23 2017 Yanko Kaneti - 3.25.1-1 - Update to 3.25.1. Meson. BR reshuffle diff --git a/sources b/sources index af92235..06c6580 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-clocks-3.25.1.tar.xz) = 93207d91bbec3cfd163e31a62e237ba3c9e92aaf794f1783ec6118fa02d63ab9625bb943245ab6dc5c992f74c11f26a31287e5b1f0b9c8486dac2a0bfdbd606e +SHA512 (gnome-clocks-3.25.2.tar.xz) = 53dd531a535434af007432f0846dc68a9e45dda958f0d820c583b723229d2243c147f99dbdb05cade6b0032af6eed9f4cb82e20bbcbda2372c25f5a6584aa0e3