Update to 3.31.1. Drop upstreamed patch

This commit is contained in:
Yanko Kaneti 2018-11-12 10:19:56 +02:00
parent 52c56a4abc
commit 37457baa35
4 changed files with 8 additions and 75 deletions

1
.gitignore vendored
View File

@ -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

View File

@ -1,68 +0,0 @@
From 4f70df82ff3800c96fcf927f499e3273cc989c88 Mon Sep 17 00:00:00 2001
From: Yanko Kaneti <yaneti@declera.com>
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 @@
<property name="orientation">vertical</property>
<property name="adjustment">adjustment_hours</property>
<property name="numeric">True</property>
+ <property name="width_chars">2</property>
<property name="wrap">True</property>
<signal name="output" handler="show_leading_zeros" swapped="no"/>
<signal name="changed" handler="update_start_button" swapped="no"/>
@@ -109,6 +110,7 @@
<property name="orientation">vertical</property>
<property name="adjustment">adjustment_minutes</property>
<property name="numeric">True</property>
+ <property name="width_chars">2</property>
<property name="wrap">True</property>
<signal name="output" handler="show_leading_zeros" swapped="no"/>
<signal name="changed" handler="update_start_button" swapped="no"/>
@@ -152,6 +154,7 @@
<property name="orientation">vertical</property>
<property name="adjustment">adjustment_seconds</property>
<property name="numeric">True</property>
+ <property name="width_chars">2</property>
<property name="wrap">True</property>
<signal name="output" handler="show_leading_zeros" swapped="no"/>
<signal name="changed" handler="update_start_button" swapped="no"/>
@@ -263,6 +266,7 @@
<property name="orientation">vertical</property>
<property name="adjustment">adjustment_hours</property>
<property name="numeric">True</property>
+ <property name="width_chars">2</property>
<property name="wrap">True</property>
<signal name="output" handler="show_leading_zeros" swapped="no"/>
<signal name="changed" handler="update_start_button" swapped="no"/>
@@ -306,6 +310,7 @@
<property name="orientation">vertical</property>
<property name="adjustment">adjustment_minutes</property>
<property name="numeric">True</property>
+ <property name="width_chars">2</property>
<property name="wrap">True</property>
<signal name="output" handler="show_leading_zeros" swapped="no"/>
<signal name="changed" handler="update_start_button" swapped="no"/>
@@ -349,6 +354,7 @@
<property name="orientation">vertical</property>
<property name="adjustment">adjustment_seconds</property>
<property name="numeric">True</property>
+ <property name="width_chars">2</property>
<property name="wrap">True</property>
<signal name="output" handler="show_leading_zeros" swapped="no"/>
<signal name="changed" handler="update_start_button" swapped="no"/>
--
2.19.0

View File

@ -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 <yaneti@declera.com> - 3.31.1-1
- Update to 3.31.1. Drop upstreamed patch
* Mon Oct 22 2018 Kalev Lember <klember@redhat.com> - 3.30.1-1
- Update to 3.30.1

View File

@ -1 +1 @@
SHA512 (gnome-clocks-3.30.1.tar.xz) = 62fc817a3ea3155b650865f6d5056ba3370da319389206d921e315be878159ff26d0b3063a2c31c85af7447ead10c5fb62bf1dfe4613e2bfac1d01b0ca7b8b3c
SHA512 (gnome-clocks-3.31.1.tar.xz) = c2f6f37198d13e4d84a63f0db6ccc64e5b078e3c37096dfc785fe45ca07701c8c3cc8dcd5416d657d638f01406d47d7ec7c1d2ad461cc52457e5bb411b0163a4