From ed61841451df690367a5bf75700b6361a2fbe5834ea45faf577e5f34aab1e142 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 14 Oct 2016 19:26:47 +0000 Subject: [PATCH] Accepting request 434340 from GNOME:Next New stable release OBS-URL: https://build.opensuse.org/request/show/434340 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=338 --- gnome-control-center-3.22.0.tar.xz | 3 --- gnome-control-center-3.22.1.tar.xz | 3 +++ ...ter-printers-fix-compilation-warning.patch | 26 ------------------- gnome-control-center.changes | 11 ++++++++ gnome-control-center.spec | 5 +--- 5 files changed, 15 insertions(+), 33 deletions(-) delete mode 100644 gnome-control-center-3.22.0.tar.xz create mode 100644 gnome-control-center-3.22.1.tar.xz delete mode 100644 gnome-control-center-printers-fix-compilation-warning.patch diff --git a/gnome-control-center-3.22.0.tar.xz b/gnome-control-center-3.22.0.tar.xz deleted file mode 100644 index 66f1638..0000000 --- a/gnome-control-center-3.22.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d264ae919aeeb27987dcdd5af5577fad0590e1f184f506b563c89f356aab5052 -size 7258436 diff --git a/gnome-control-center-3.22.1.tar.xz b/gnome-control-center-3.22.1.tar.xz new file mode 100644 index 0000000..721f9aa --- /dev/null +++ b/gnome-control-center-3.22.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d69295bc43176392d65b3bdbe60eb85cdcac95b1ef76b86933f3ba9cf48091a +size 7206136 diff --git a/gnome-control-center-printers-fix-compilation-warning.patch b/gnome-control-center-printers-fix-compilation-warning.patch deleted file mode 100644 index c7c8e81..0000000 --- a/gnome-control-center-printers-fix-compilation-warning.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 77750c507615788d46ec66a25368fe4aa4a83966 Mon Sep 17 00:00:00 2001 -From: Marek Kasik -Date: Tue, 20 Sep 2016 12:29:09 +0200 -Subject: printers: Fix compilation warning - -We need to include cups/ppd.h explicitly due to some modification -of structure of CUPS headers ---- - panels/printers/cc-printers-panel.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c -index 4c88223..fb55608 100644 ---- a/panels/printers/cc-printers-panel.c -+++ b/panels/printers/cc-printers-panel.c -@@ -29,6 +29,7 @@ - #include - - #include -+#include - - #include - --- -cgit v0.12 - diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 694d6bc..5b0f39e 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Oct 11 14:49:53 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.22.1: + + Display: Ensure the preselected resolution matches the current + mode. + + Keyboard: Fix capture of Alt+PrintScreen shortcuts. + + Updated translations. +- Drop gnome-control-center-printers-fix-compilation-warning.patch: + Fixed upstream. + ------------------------------------------------------------------- Sat Sep 24 22:30:19 UTC 2016 - zaitor@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 90179f2..1fb6c8d 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -29,7 +29,7 @@ %define with_cacert_patch 0 Name: gnome-control-center -Version: 3.22.0 +Version: 3.22.1 Release: 0 Summary: The GNOME Control Center License: GPL-2.0+ @@ -50,8 +50,6 @@ Patch18: gnome-control-center-890979-change-remote-passwd.patch Patch20: gnome-control-center-disable-error-message-for-NM.patch # PATCH-FIX-OPENSUSE gnome-control-center-info-never-use-gnome-software.patch bsc#999336 fezhang@suse.com -- info: Never search for gnome-software as an option when checking for updates on SLE and Leap 42.2, because we use gpk-update-viewer. Patch21: gnome-control-center-info-never-use-gnome-software.patch -# PATCH-FIX-UPSTREAM gnome-control-center-printers-fix-compilation-warning.patch zaitor@opensuse.org -- Adapt to changes in cups -Patch22: gnome-control-center-printers-fix-compilation-warning.patch # PATCH-FIX-UPSTREAM gnome-control-center-display-fix-possible-crash-on-startup.patch bgo#771875 zaitor@opensuse.org -- Display: Fix possible crash on startup Patch23: gnome-control-center-display-fix-possible-crash-on-startup.patch BuildRequires: cups-devel @@ -219,7 +217,6 @@ translation-update-upstream %if 0%{?suse_version} == 1315 %patch21 -p1 %endif -%patch22 -p1 %patch23 -p1 %build