Accepting request 329470 from GNOME:Next

New unstable, now with your rebase of patch :-) OBS-URL: https://build.opensuse.org/request/show/329470 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=292
2015-09-07 10:15:04 +00:00 · 2015-09-07 10:15:04 +00:00 · 7bb42eefd1
commit 7bb42eefd1
parent da6d3dc7ab
13 changed files with 164 additions and 151 deletions
--- a/gcc-private-connection.patch
+++ b/gcc-private-connection.patch
@ -19,10 +19,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=646187
 panels/network/network-dialogs.h   |  6 ++++--
 7 files changed, 94 insertions(+), 9 deletions(-)

-Index: gnome-control-center-3.13.90/configure.ac
+Index: gnome-control-center-3.17.2/configure.ac
 ===================================================================
--- gnome-control-center-3.13.90.orig/configure.ac
-+++ gnome-control-center-3.13.90/configure.ac
+--- gnome-control-center-3.17.2.orig/configure.ac
+++ gnome-control-center-3.17.2/configure.ac
@@ -137,7 +137,8 @@ PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMO
 PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
 PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
@ -33,10 +33,10 @@ Index: gnome-control-center-3.13.90/configure.ac
 PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES)
 PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
 PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0
-Index: gnome-control-center-3.13.90/panels/network/cc-network-panel.c
+Index: gnome-control-center-3.17.2/panels/network/cc-network-panel.c
 ===================================================================
--- gnome-control-center-3.13.90.orig/panels/network/cc-network-panel.c
-+++ gnome-control-center-3.13.90/panels/network/cc-network-panel.c
+--- gnome-control-center-3.17.2.orig/panels/network/cc-network-panel.c
+++ gnome-control-center-3.17.2/panels/network/cc-network-panel.c
@@ -23,6 +23,8 @@
 #include <glib/gi18n.h>
 #include <stdlib.h>
@ -46,7 +46,7 @@ Index: gnome-control-center-3.13.90/panels/network/cc-network-panel.c
 #include "cc-network-panel.h"
 #include "cc-network-resources.h"
 
-@@ -86,6 +88,9 @@ struct _CcNetworkPanelPrivate
+@@ -84,6 +86,9 @@ struct _CcNetworkPanelPrivate
         gchar            *arg_device;
         gchar            *arg_access_point;
         gboolean          operation_done;
@ -56,7 +56,7 @@ Index: gnome-control-center-3.13.90/panels/network/cc-network-panel.c
 };
 
 enum {
-@@ -582,13 +587,13 @@ handle_argv_for_device (CcNetworkPanel *
+@@ -576,13 +581,13 @@ handle_argv_for_device (CcNetworkPanel *
                 return TRUE;
         } else if (g_strcmp0 (nm_object_get_path (NM_OBJECT (device)), priv->arg_device) == 0) {
                 if (priv->arg_operation == OPERATION_CONNECT_MOBILE) {
@ -72,21 +72,20 @@ Index: gnome-control-center-3.13.90/panels/network/cc-network-panel.c
                         reset_command_line_args (panel); /* done */
                         select_tree_iter (panel, iter);
                         return TRUE;
-@@ -1400,6 +1405,9 @@ cc_network_panel_init (CcNetworkPanel *p
-         GtkWidget *widget;
+@@ -1374,6 +1379,9 @@ cc_network_panel_init (CcNetworkPanel *p
         GtkWidget *toplevel;
         GDBusConnection *system_bus;
+         GtkCssProvider *provider;
 +	PolkitSubject    *subject;
 +	PolkitAuthority  *authority;
 +	PolkitAuthorizationResult *result;
 
         panel->priv = NETWORK_PANEL_PRIVATE (panel);
         g_resources_register (cc_network_get_resource ());
-@@ -1503,4 +1511,32 @@ cc_network_panel_init (CcNetworkPanel *p
-         widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
-                                                      "vbox1"));
-         gtk_container_add (GTK_CONTAINER (panel), widget);
-+
+@@ -1485,4 +1493,32 @@ cc_network_panel_init (CcNetworkPanel *p
+                                                    GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+         g_object_unref (provider);
+ 
 +	/* check the polkit authentication */
 +	panel->priv->default_private = TRUE;
 +	authority = polkit_authority_get_sync (NULL, NULL);
@ -98,6 +97,7 @@ Index: gnome-control-center-3.13.90/panels/network/cc-network-panel.c
 +                                                            POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE,
 +                                                            NULL,
 +                                                            &error);
+
 +	if (error || !result) {
 +		g_warning ("Failed to check polkit authorization! %s",
 +				error->message);
@ -115,10 +115,10 @@ Index: gnome-control-center-3.13.90/panels/network/cc-network-panel.c
 +{
 +        return panel->priv->default_private;
 }
-Index: gnome-control-center-3.13.90/panels/network/cc-network-panel.h
+Index: gnome-control-center-3.17.2/panels/network/cc-network-panel.h
 ===================================================================
--- gnome-control-center-3.13.90.orig/panels/network/cc-network-panel.h
-+++ gnome-control-center-3.13.90/panels/network/cc-network-panel.h
+--- gnome-control-center-3.17.2.orig/panels/network/cc-network-panel.h
+++ gnome-control-center-3.17.2/panels/network/cc-network-panel.h
@@ -66,6 +66,8 @@ GType cc_network_panel_get_type (void) G
 
 GPtrArray *cc_network_panel_get_devices (CcNetworkPanel *panel);
@ -128,10 +128,10 @@ Index: gnome-control-center-3.13.90/panels/network/cc-network-panel.h
 G_END_DECLS
 
 #endif /* _CC_NETWORK_PANEL_H */
-Index: gnome-control-center-3.13.90/panels/network/net-device-mobile.c
+Index: gnome-control-center-3.17.2/panels/network/net-device-mobile.c
 ===================================================================
--- gnome-control-center-3.13.90.orig/panels/network/net-device-mobile.c
-+++ gnome-control-center-3.13.90/panels/network/net-device-mobile.c
+--- gnome-control-center-3.17.2.orig/panels/network/net-device-mobile.c
+++ gnome-control-center-3.17.2/panels/network/net-device-mobile.c
@@ -141,12 +141,15 @@ mobile_connection_changed_cb (GtkComboBo
                             COLUMN_ID, &object_path,
                             -1);
@ -149,11 +149,11 @@ Index: gnome-control-center-3.13.90/panels/network/net-device-mobile.c
                 goto out;
         }
 
-Index: gnome-control-center-3.13.90/panels/network/net-device-wifi.c
+Index: gnome-control-center-3.17.2/panels/network/net-device-wifi.c
 ===================================================================
--- gnome-control-center-3.13.90.orig/panels/network/net-device-wifi.c
-+++ gnome-control-center-3.13.90/panels/network/net-device-wifi.c
-@@ -697,6 +697,9 @@ wireless_try_to_connect (NetDeviceWifi *
+--- gnome-control-center-3.17.2.orig/panels/network/net-device-wifi.c
+++ gnome-control-center-3.17.2/panels/network/net-device-wifi.c
+@@ -701,6 +701,9 @@ wireless_try_to_connect (NetDeviceWifi *
         NMDevice *device;
         NMSettingWireless *setting_wireless;
         NMClient *client;
@ -163,7 +163,7 @@ Index: gnome-control-center-3.13.90/panels/network/net-device-wifi.c
 
         if (device_wifi->priv->updating_device)
                 goto out;
-@@ -748,10 +751,21 @@ wireless_try_to_connect (NetDeviceWifi *
+@@ -752,10 +755,21 @@ wireless_try_to_connect (NetDeviceWifi *
         /* create one, as it's missing */
         g_debug ("no existing connection found for %s, creating", ssid_target);
 
@ -186,7 +186,7 @@ Index: gnome-control-center-3.13.90/panels/network/net-device-wifi.c
                                                        device, ap_object_path,
                                                        connection_add_activate_cb, device_wifi);
         } else {
-@@ -995,6 +1009,7 @@ start_shared_connection (NetDeviceWifi *
+@@ -996,6 +1010,7 @@ start_shared_connection (NetDeviceWifi *
         NMClient *client;
         const char *mode;
         NMDeviceWifiCapabilities caps;
@ -194,7 +194,7 @@ Index: gnome-control-center-3.13.90/panels/network/net-device-wifi.c
 
         device = net_device_get_nm_device (NET_DEVICE (device_wifi));
         g_assert (nm_device_get_device_type (device) == NM_DEVICE_TYPE_WIFI);
-@@ -1031,6 +1046,14 @@ start_shared_connection (NetDeviceWifi *
+@@ -1032,6 +1047,14 @@ start_shared_connection (NetDeviceWifi *
                       "id", "Hotspot",
                       "autoconnect", FALSE,
                       NULL);
@ -209,10 +209,10 @@ Index: gnome-control-center-3.13.90/panels/network/net-device-wifi.c
         nm_connection_add_setting (c, (NMSetting *)sc);
 
         sw = (NMSettingWireless *)nm_setting_wireless_new ();
-Index: gnome-control-center-3.13.90/panels/network/network-dialogs.c
+Index: gnome-control-center-3.17.2/panels/network/network-dialogs.c
 ===================================================================
--- gnome-control-center-3.13.90.orig/panels/network/network-dialogs.c
-+++ gnome-control-center-3.13.90/panels/network/network-dialogs.c
+--- gnome-control-center-3.17.2.orig/panels/network/network-dialogs.c
+++ gnome-control-center-3.17.2/panels/network/network-dialogs.c
@@ -41,6 +41,7 @@ typedef struct {
         NMClient *client;
         NMRemoteSettings *settings;
@ -298,10 +298,10 @@ Index: gnome-control-center-3.13.90/panels/network/network-dialogs.c
 
 	caps = nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (device));
 	if (caps & NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) {
-Index: gnome-control-center-3.13.90/panels/network/network-dialogs.h
+Index: gnome-control-center-3.17.2/panels/network/network-dialogs.h
 ===================================================================
--- gnome-control-center-3.13.90.orig/panels/network/network-dialogs.h
-+++ gnome-control-center-3.13.90/panels/network/network-dialogs.h
+--- gnome-control-center-3.17.2.orig/panels/network/network-dialogs.h
+++ gnome-control-center-3.17.2/panels/network/network-dialogs.h
@@ -38,11 +38,13 @@ void cc_network_panel_connect_to_8021x_n
                                                 NMClient         *client,
                                                 NMRemoteSettings *settings,
--- a/gnome-control-center-3.16.3.tar.xz
+++ b/gnome-control-center-3.16.3.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ff9fe9c703be1d0e3afdef7b9ea331e436846ccd4d35090d501ba9510ee5a0c5
-size 7045744
--- a/gnome-control-center-3.17.90.tar.xz
+++ b/gnome-control-center-3.17.90.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:49f8c5e26a51f7b94cc0574de01a4cb321a82f3cdc847d2038670be2991bd8a8
+size 7069184
--- a/gnome-control-center-Pyongyang-Time.patch
+++ b/gnome-control-center-Pyongyang-Time.patch
@ -1,25 +0,0 @@
-From cc600a918b2a6c34ae81cf85ef7b49a8e3f02ee6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@0d.be>
-Date: Tue, 18 Aug 2015 00:16:44 +0200
-Subject: [PATCH 01/13] datetime: update timezones for new "Pyongyang Time"
-
-https://bugzilla.gnome.org/show_bug.cgi?id=753643
---
- panels/datetime/datetime.gresource.xml    |   2 ++
-
-diff --git a/panels/datetime/datetime.gresource.xml b/panels/datetime/datetime.gresource.xml
-index 3282dcd..ccbf955 100644
--- a/panels/datetime/datetime.gresource.xml
-+++ b/panels/datetime/datetime.gresource.xml
-@@ -81,6 +81,8 @@
-     <file alias="timezone_-8_dim.png">data/timezone_-8_dim.png</file>
-     <file alias="timezone_8.png">data/timezone_8.png</file>
-     <file alias="timezone_8_dim.png">data/timezone_8_dim.png</file>
-+    <file alias="timezone_8.5.png">data/timezone_8.5.png</file>
-+    <file alias="timezone_8.5_dim.png">data/timezone_8.5_dim.png</file>
-     <file alias="timezone_8.75.png">data/timezone_8.75.png</file>
-     <file alias="timezone_8.75_dim.png">data/timezone_8.75_dim.png</file>
-     <file alias="timezone_-9.png">data/timezone_-9.png</file>
-- 
-2.4.6
-
--- a/gnome-control-center-allow-extra-tools-in-shell.patch
+++ b/gnome-control-center-allow-extra-tools-in-shell.patch
@ -8,10 +8,10 @@ Subject: [PATCH] allow extra tools in shell
 shell/cc-window.c       | 43 ++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 23 deletions(-)

-Index: gnome-control-center-3.13.4/shell/cc-panel-loader.c
+Index: gnome-control-center-3.17.90/shell/cc-panel-loader.c
 ===================================================================
--- gnome-control-center-3.13.4.orig/shell/cc-panel-loader.c
-+++ gnome-control-center-3.13.4/shell/cc-panel-loader.c
+--- gnome-control-center-3.17.90.orig/shell/cc-panel-loader.c
+++ gnome-control-center-3.17.90/shell/cc-panel-loader.c
@@ -73,35 +73,42 @@ static struct {
   GType (*get_type)(void);
 #endif
@ -108,19 +108,10 @@ Index: gnome-control-center-3.13.4/shell/cc-panel-loader.c
       g_object_unref (app);
     }
 }
-@@ -226,6 +245,8 @@ cc_panel_loader_add_option_groups (GOpti
-     {
-       GType (*get_type) (void);
-       get_type = all_panels[i].get_type;
-+      if (get_type == NULL)
-+        continue;
-       GOptionGroup *group = cc_panel_get_option_group (get_type(), builder);
-       if (group == NULL)
-         continue;
-Index: gnome-control-center-3.13.4/shell/cc-window.c
+Index: gnome-control-center-3.17.90/shell/cc-window.c
 ===================================================================
--- gnome-control-center-3.13.4.orig/shell/cc-window.c
-+++ gnome-control-center-3.13.4/shell/cc-window.c
+--- gnome-control-center-3.17.90.orig/shell/cc-window.c
+++ gnome-control-center-3.17.90/shell/cc-window.c
@@ -140,6 +140,41 @@ get_icon_name_from_g_icon (GIcon *gicon)
   return NULL;
 }
@ -176,7 +167,7 @@ Index: gnome-control-center-3.13.4/shell/cc-window.c
 
   priv->current_panel = GTK_WIDGET (cc_panel_loader_load_by_name (CC_SHELL (self), id, parameters));
   cc_shell_set_active_panel (CC_SHELL (self), CC_PANEL (priv->current_panel));
-@@ -1498,7 +1539,7 @@ create_header (CcWindow *self)
+@@ -1502,7 +1543,7 @@ create_header (CcWindow *self)
   gtk_button_set_image (GTK_BUTTON (priv->search_button), image);
   gtk_widget_set_valign (priv->search_button, GTK_ALIGN_CENTER);
   gtk_style_context_add_class (gtk_widget_get_style_context (priv->search_button),
--- a/gnome-control-center-fix-nb-tans.patch
+++ b/gnome-control-center-fix-nb-tans.patch
@ -1,11 +1,12 @@
--- gnome-control-center-3.17.3-orig/po/nb.po	2015-07-10 13:09:23.000000000 +0200
-+++ gnome-control-center-3.17.3/po/nb.po	2015-07-29 11:17:27.451128923 +0200
-@@ -3882,7 +3882,7 @@
+--- gnome-control-center-3.17.90-orig/po/nb.po  2015-08-12 17:42:56.000000000 +0200
+++ gnome-control-center-3.17.90/po/nb.po       2015-08-18 13:48:05.526900500 +0200
+@@ -3921,7 +3921,7 @@
 
- #: ../panels/power/cc-power-panel.c:1504
+ #: ../panels/power/cc-power-panel.c:1621
 msgid "_Keyboard brightness"
 -msgstr "Lysstyrke for s_kjerm"
 +msgstr "Lysstyrke for tastatur"
 
- #: ../panels/power/cc-power-panel.c:1514
+ #: ../panels/power/cc-power-panel.c:1631
 msgid "_Dim screen when inactive"
+
--- a/gnome-control-center-hide-firewall-zone-entry.patch
+++ b/gnome-control-center-hide-firewall-zone-entry.patch
@ -12,10 +12,10 @@ entry to avoid confusions.
 panels/network/connection-editor/wifi-page.ui     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

-diff --git a/panels/network/connection-editor/ethernet-page.ui b/panels/network/connection-editor/ethernet-page.ui
-index 59d1a35..f6f604e 100644
--- a/panels/network/connection-editor/ethernet-page.ui
-+++ b/panels/network/connection-editor/ethernet-page.ui
+Index: gnome-control-center-3.17.2/panels/network/connection-editor/ethernet-page.ui
+===================================================================
+--- gnome-control-center-3.17.2.orig/panels/network/connection-editor/ethernet-page.ui
+++ gnome-control-center-3.17.2/panels/network/connection-editor/ethernet-page.ui
@@ -264,7 +264,7 @@
     </child>
     <child>
@ -34,10 +34,10 @@ index 59d1a35..f6f604e 100644
         <property name="can_focus">False</property>
         <property name="entry_text_column">0</property>
         <property name="id_column">1</property>
-diff --git a/panels/network/connection-editor/vpn-page.ui b/panels/network/connection-editor/vpn-page.ui
-index dea9a4a..c0f5e92 100644
--- a/panels/network/connection-editor/vpn-page.ui
-+++ b/panels/network/connection-editor/vpn-page.ui
+Index: gnome-control-center-3.17.2/panels/network/connection-editor/vpn-page.ui
+===================================================================
+--- gnome-control-center-3.17.2.orig/panels/network/connection-editor/vpn-page.ui
+++ gnome-control-center-3.17.2/panels/network/connection-editor/vpn-page.ui
@@ -57,7 +57,7 @@
         <property name="spacing">6</property>
         <child>
@ -56,28 +56,3 @@ index dea9a4a..c0f5e92 100644
             <property name="can_focus">False</property>
             <property name="entry_text_column">0</property>
             <property name="id_column">1</property>
-diff --git a/panels/network/connection-editor/wifi-page.ui b/panels/network/connection-editor/wifi-page.ui
-index 3986015..bb154da 100644
--- a/panels/network/connection-editor/wifi-page.ui
-+++ b/panels/network/connection-editor/wifi-page.ui
-@@ -174,7 +174,7 @@
-     </child>
-     <child>
-       <object class="GtkLabel" id="heading_zone">
-        <property name="visible">True</property>
-+        <property name="visible">False</property>
-         <property name="can_focus">False</property>
-         <property name="xalign">1</property>
-         <property name="label" translatable="yes">Firewall _Zone</property>
-@@ -190,7 +190,7 @@
-     </child>
-     <child>
-       <object class="GtkComboBoxText" id="combo_zone">
-        <property name="visible">True</property>
-+        <property name="visible">False</property>
-         <property name="can_focus">False</property>
-         <property name="entry_text_column">0</property>
-         <property name="id_column">1</property>
-- 
-1.7.12.4
-
--- a/gnome-control-center.changes
+++ b/gnome-control-center.changes
@ -1,3 +1,96 @@
+-------------------------------------------------------------------
+Fri Sep  4 11:09:01 UTC 2015 - dimstar@opensuse.org
+
+- Rebase gnome-control-center-allow-extra-tools-in-shell.patch.
+
+-------------------------------------------------------------------
+Mon Aug 31 06:45:34 UTC 2015 - zaitor@opensuse.org
+
+- Update to version 3.17.90:
+  + Date & Time: Support for new "Pyongyang Time".
+  + Network:
+    - Rename hotspot security key to "Password".
+    - Fix unintentionally centered checkbutton labels.
+  + Notifications: Don't crash because of zero-length string.
+  + Power:
+    - Improve labels for wifi and mobile broadband toggles.
+    - Replace WiMax reference with LTE.
+  + Printers: Fix a problem where the wrong printer driver would
+    get installed.
+  + Region and Language: Don't ever show all input sources in the
+    chooser.
+  + Sharing:
+    - Accessibility improvements.
+    - Remove "Bluetooth" (Obex) sharing, moved into the
+      Bluetooth panel.
+    - Better UI when Bluetooth is disabled.
+- Rebase gnome-control-center-fix-nb-tans.patch.
+- Drop gnome-control-center-Pyongyang-Time.patch and corresponding
+  source files, no longer needed.
+
+-------------------------------------------------------------------
+Mon Aug 31 06:45:33 UTC 2015 - zaitor@opensuse.org
+
+- Update to version 3.17.3:
+  + Shell: Plenty of command-line options handling fixes.
+  + Date & Time:
+    - Show date buttons in the order that the locale uses them.
+    - Further date button ordering fixes for Cechen and HK English.
+    - Fix incorrect sensitivity when permission is missing.
+    - Fix accessibility of the hour and minutes spinbuttons.
+  + Display:
+    - Don't show rotation for builtin display on tablets.
+    - Add support for tiled monitors (usually 4K monitors).
+  + Network:
+    - Fix all Wi-Fi networks having gear buttons.
+    - Only share a new wifi connection if the user is allowed to.
+    - Fix possible crash when changing airplane mode.
+    - Fix possible crash when connections change after Network
+      panel was closed.
+  + Power:
+    - Describe batteries properly when not called BAT0.
+    - Fix possible crash if up_client_get_devices() fails.
+    - Make the automatic suspend row accessible.
+  + Printers:
+    - Fix possible crash after closing the panel.
+    - Set focus of the 'New printer dialog' correctly.
+    - Fix focus chain of the 'New printer dialog'.
+    - Install selected printer when the row is activated.
+    - Fix setting of page size.
+    - Don't expand search entry.
+    - Show border around 'No printers detected' text.
+    - Don't show the same device multiple times.
+  + Region & Language: Fixes to the region and language lists.
+  + Sharing: Make it possible to override SSHD_SERVICE for
+    Debian-based systems.
+  + Sound: Support more channels in speaker test.
+  + User Accounts: Fix enterprise user login never working.
+  + Wacom: Fix window decorations being visible in calibrator
+    window.
+- Temp disable
+  gnome-control-center-allow-extra-tools-in-shell.patch,
+  gcc-private-connection.patch and
+  gnome-control-center-follow-polkit-permissions-for-tz.patch:
+  Needs rebase.
+
+-------------------------------------------------------------------
+Mon Aug 31 06:45:32 UTC 2015 - dimstar@opensuse.org
+
+- Update to version 3.17.2:
+  + Keyboard: Honor immutable command/name in custom commands.
+  + Network:
+    - Make the gear buttons round.
+    - Prevent a use after free crash when removing virtual devices.
+  + Power:
+    - Add support for display dimming using an ambient light
+      sensor.
+    - Hide Bluetooth power section when w/o BT.
+    - Remove "When battery power is critical" label which isn't
+      configurable by normal users since UPower 1.0.
+  + Updated translations.
+- Rebase gnome-control-center-hide-firewall-zone-entry.patch and
+  gcc-private-connection.patch.
+
 -------------------------------------------------------------------
 Mon Aug 31 06:45:31 UTC 2015 - dimstar@opensuse.org

--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@ -29,19 +29,14 @@
 %define with_cacert_patch 1

 Name:           gnome-control-center
-Version:        3.16.3
+Version:        3.17.90
 Release:        0
 # FIXME: in 12.3 and later, check if we still need patch2 (gnome-control-center-hide-region-system-tab.patch) (see bnc#703833)
 Summary:        The GNOME Control Center
 License:        GPL-2.0+
 Group:          System/GUI/GNOME
 Url:            http://www.gnome.org
-Source0:        http://download.gnome.org/sources/gnome-control-center/3.16/%{name}-%{version}.tar.xz
-# the timezone images should be part of Patch19 (pyongang timezone), but 'patch' does not like binary files that much
-Source1:        timezone_8.5.png
-Source2:        timezone_8.5_dim.png
-Source3:        timezone_9.png
-Source4:        timezone_9_dim.png
+Source:         http://download.gnome.org/sources/gnome-control-center/3.17/%{name}-%{version}.tar.xz
 # PATCH-FEATURE-OPENSUSE gnome-control-center-allow-extra-tools-in-shell.patch fezhang@suse.com -- Add dconf-editor, pkg-prefs, gnome-tweak-tool and tracker-preferences to gnome-control-center-allow-yast-in-shell.patch so that they can launch from g-c-c shell like YaST does. Also change the patch with a more generic name.
 Patch0:         gnome-control-center-allow-extra-tools-in-shell.patch
 # PATCH-FEATURE-OPENSUSE gnome-control-center-hide-firewall-zone-entry.patch bnc#894394 fezhang@suse.com -- network: hide the firewall zone entry for firewalld, which is not used in opensuse
@ -53,12 +48,10 @@ Patch14:        gnome-control-center-system-proxy-configuration.patch
 Patch15:        gcc-private-connection.patch
 # PATCH-FIX-UPSTREAM gnome-control-center-probe-radius-server-cert.patch bnc#574266 glin@suse.com -- network: Probe the RADIUS server certificate
 Patch16:        gnome-control-center-probe-radius-server-cert.patch
-# PATCH-FEATURE-OPENSUSE gnome-control-center-follow-polkit-permissions-for-tz.patch boo#904058 badshah400@gmail.com -- Follow polkit permissions for allowing/locking timezone setting changes
+# PATCH-NEEDS-REBASE was: PATCH-FEATURE-OPENSUSE gnome-control-center-follow-polkit-permissions-for-tz.patch boo#904058 badshah400@gmail.com -- Follow polkit permissions for allowing/locking timezone setting changes
 Patch17:        gnome-control-center-follow-polkit-permissions-for-tz.patch
 # PATCH-FIX-UPSTREAM gnome-control-center-fix-nb-tans.patch bgo#753005 zaitor@opensuse.org -- Fix translation of Keyboard brightness in Norwegian bokmål.
 Patch18:        gnome-control-center-fix-nb-tans.patch
-# PATCH-FIX-UPSTREAM gnome-control-center-Pyongyang-Time.patch dimstar@opensuse.org -- Fix build with new timezone data for Pyongyang time
-Patch19:        gnome-control-center-Pyongyang-Time.patch
 BuildRequires:  cups-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
@ -82,7 +75,7 @@ BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.39.91
 BuildRequires:  pkgconfig(gmodule-2.0)
 BuildRequires:  pkgconfig(gnome-bluetooth-1.0) >= 3.11.1
-BuildRequires:  pkgconfig(gnome-desktop-3.0) >= 3.11.3
+BuildRequires:  pkgconfig(gnome-desktop-3.0) >= 3.17.4
 BuildRequires:  pkgconfig(gnome-settings-daemon) >= 3.7.3
 BuildRequires:  pkgconfig(goa-1.0) >= 3.9.90
 BuildRequires:  pkgconfig(goa-backend-1.0)
@ -200,13 +193,10 @@ translation-update-upstream
 %if %{with_cacert_patch}
 %patch16 -p1
 %endif
-%patch17 -p1
+#%%patch17 -p1
 #NEEDS-REBASE
 #patch14 -p1
 %patch18 -p1
-%patch19 -p1
-# install new images for the timezone map into the source directory
-install %{S:1} %{S:2} %{S:3} %{S:4} panels/datetime/data

 %build
 ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh
--- a/timezone_8.5.png
+++ b/timezone_8.5.png
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cd541f5fae89b39c46b6d774257f351242f10d2908d70f1639faf92d6edaa939
-size 2069
--- a/timezone_8.5_dim.png
+++ b/timezone_8.5_dim.png
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:486a23eb485da73257149cb114c222037a3ba2792c474b4a6be7eaa61f24c42a
-size 1177
--- a/timezone_9.png
+++ b/timezone_9.png
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3dbb7fd66a0e5cc17c266ccd11a47cd0e1e7e663484c22bfac61528d94bed408
-size 14381
--- a/timezone_9_dim.png
+++ b/timezone_9_dim.png
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6e10031895021443ec562e07db78bcfc580ef0362b1074f5a1f22f5d384be6c8
-size 8377