diff --git a/.gitignore b/.gitignore index eb9b610..7ea184f 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ /gnome-clocks-3.28.0.tar.xz /gnome-clocks-3.30.0.tar.xz /gnome-clocks-3.30.1.tar.xz +/gnome-clocks-3.31.1.tar.xz diff --git a/0001-timer-Set-width-chars-2-property-on-the-spinbuttons.patch b/0001-timer-Set-width-chars-2-property-on-the-spinbuttons.patch deleted file mode 100644 index cb9321d..0000000 --- a/0001-timer-Set-width-chars-2-property-on-the-spinbuttons.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 4f70df82ff3800c96fcf927f499e3273cc989c88 Mon Sep 17 00:00:00 2001 -From: Yanko Kaneti -Date: Tue, 18 Sep 2018 16:26:52 +0300 -Subject: [PATCH] timer: Set width-chars=2 property on the spinbuttons - -Set width-chars to help gtk pre-allocate the spin buttons -drawing area regardless of font - -Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1630248 ---- - data/ui/timer.ui | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/data/ui/timer.ui b/data/ui/timer.ui -index 40ff931..7c37afe 100644 ---- a/data/ui/timer.ui -+++ b/data/ui/timer.ui -@@ -67,6 +67,7 @@ - vertical - adjustment_hours - True -+ 2 - True - - -@@ -109,6 +110,7 @@ - vertical - adjustment_minutes - True -+ 2 - True - - -@@ -152,6 +154,7 @@ - vertical - adjustment_seconds - True -+ 2 - True - - -@@ -263,6 +266,7 @@ - vertical - adjustment_hours - True -+ 2 - True - - -@@ -306,6 +310,7 @@ - vertical - adjustment_minutes - True -+ 2 - True - - -@@ -349,6 +354,7 @@ - vertical - adjustment_seconds - True -+ 2 - True - - --- -2.19.0 - diff --git a/gnome-clocks.spec b/gnome-clocks.spec index 15947d6..9e363e1 100644 --- a/gnome-clocks.spec +++ b/gnome-clocks.spec @@ -1,16 +1,13 @@ %global libgweather_version 3.27.2 Name: gnome-clocks -Version: 3.30.1 +Version: 3.31.1 Release: 1%{?dist} Summary: Clock application designed for GNOME 3 License: GPLv2+ URL: https://wiki.gnome.org/Apps/Clocks -Source0: https://download.gnome.org/sources/gnome-clocks/3.30/%{name}-%{version}.tar.xz - -# https://gitlab.gnome.org/GNOME/gnome-clocks/merge_requests/5 -Patch1: 0001-timer-Set-width-chars-2-property-on-the-spinbuttons.patch +Source0: https://download.gnome.org/sources/gnome-clocks/3.31/%{name}-%{version}.tar.xz BuildRequires: meson BuildRequires: desktop-file-utils @@ -52,7 +49,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.clocks.d %license COPYING %{_bindir}/gnome-clocks %{_datadir}/gnome-clocks -%{_datadir}/icons/hicolor/*/apps/org.gnome.clocks.png +%{_datadir}/icons/hicolor/scalable/apps/org.gnome.clocks.svg %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.clocks-symbolic.svg %{_datadir}/applications/org.gnome.clocks.desktop %{_datadir}/dbus-1/services/org.gnome.clocks.service @@ -63,6 +60,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.clocks.d %{_datadir}/metainfo/org.gnome.clocks.appdata.xml %changelog +* Mon Nov 12 2018 Yanko Kaneti - 3.31.1-1 +- Update to 3.31.1. Drop upstreamed patch + * Mon Oct 22 2018 Kalev Lember - 3.30.1-1 - Update to 3.30.1 diff --git a/sources b/sources index 9004296..d5a8e52 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-clocks-3.30.1.tar.xz) = 62fc817a3ea3155b650865f6d5056ba3370da319389206d921e315be878159ff26d0b3063a2c31c85af7447ead10c5fb62bf1dfe4613e2bfac1d01b0ca7b8b3c +SHA512 (gnome-clocks-3.31.1.tar.xz) = c2f6f37198d13e4d84a63f0db6ccc64e5b078e3c37096dfc785fe45ca07701c8c3cc8dcd5416d657d638f01406d47d7ec7c1d2ad461cc52457e5bb411b0163a4