Accepting request 349178 from home:badshah400:boo956879

Corrected bug number in changelog.

- Remove alacarte from the g-c-c shell for openSUSE while still keeping it for SLE (they use classic gnome, where it still works)
- Rebase tz patch and re-enable it to allow tz changing without admin privileges.

OBS-URL: https://build.opensuse.org/request/show/349178
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=301

gnome-control-center-add-alacarte-for-sle.patch

@@ -0,0 +1,12 @@
+Index: gnome-control-center-3.18.2/shell/cc-panel-loader.c
+===================================================================
+--- gnome-control-center-3.18.2.orig/shell/cc-panel-loader.c
++++ gnome-control-center-3.18.2/shell/cc-panel-loader.c
+@@ -103,6 +103,7 @@ static struct {
+   PANEL_TYPE("wacom",               cc_wacom_panel_get_type        ),
+ #endif
+   PANEL_TYPE("ca.desrt.dconf-editor",        NULL                           ),
++  PANEL_TYPE("alacarte",            NULL                           ),
+   PANEL_TYPE("gpk-prefs",           NULL                           ),
+   PANEL_TYPE("tracker-preferences", NULL                           ),
+   PANEL_TYPE("itweb-settings",      NULL                           ),

gnome-control-center-allow-extra-tools-in-shell.patch

@@ -12,7 +12,7 @@ Index: gnome-control-center-3.17.90/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 {
+@@ -73,35 +73,41 @@ static struct {
    GType (*get_type)(void);
  #endif
  } all_panels[] = {
@@ -67,7 +67,6 @@ Index: gnome-control-center-3.17.90/shell/cc-panel-loader.c
 +  PANEL_TYPE("wacom",               cc_wacom_panel_get_type        ),
  #endif
 +  PANEL_TYPE("ca.desrt.dconf-editor",        NULL                           ),
-+  PANEL_TYPE("alacarte",            NULL                           ),
 +  PANEL_TYPE("gpk-prefs",           NULL                           ),
 +  PANEL_TYPE("tracker-preferences", NULL                           ),
 +  PANEL_TYPE("itweb-settings",      NULL                           ),

gnome-control-center-follow-polkit-permissions-for-tz.patch

@@ -1,7 +1,7 @@
-Index: gnome-control-center-3.14.1/panels/datetime/cc-datetime-panel.c
+Index: gnome-control-center-3.18.2/panels/datetime/cc-datetime-panel.c
 ===================================================================
---- gnome-control-center-3.14.1.orig/panels/datetime/cc-datetime-panel.c
+--- gnome-control-center-3.18.2.orig/panels/datetime/cc-datetime-panel.c
-+++ gnome-control-center-3.14.1/panels/datetime/cc-datetime-panel.c
++++ gnome-control-center-3.18.2/panels/datetime/cc-datetime-panel.c
 @@ -59,6 +59,7 @@ enum {
  #define W(x) (GtkWidget*) gtk_builder_get_object (priv->builder, x)
  
@@ -33,8 +33,8 @@ Index: gnome-control-center-3.14.1/panels/datetime/cc-datetime-panel.c
 -  gboolean allowed, auto_timezone, using_ntp;
 +  gboolean allowed, tz_allowed, auto_timezone, using_ntp;
  
-   allowed = (priv->permission == NULL || g_permission_get_allowed (priv->permission));
+   allowed = (priv->permission != NULL && g_permission_get_allowed (priv->permission));
-+  tz_allowed = (priv->tz_permission == NULL || g_permission_get_allowed (priv->tz_permission));
++  tz_allowed = (priv->tz_permission != NULL && g_permission_get_allowed (priv->tz_permission));
    using_ntp = gtk_switch_get_active (GTK_SWITCH (W("network_time_switch")));
    auto_timezone = gtk_switch_get_active (GTK_SWITCH (W("auto_timezone_switch")));
  
@@ -70,8 +70,8 @@ Index: gnome-control-center-3.14.1/panels/datetime/cc-datetime-panel.c
 +  gboolean allowed;
 +
 +  active = g_value_get_boolean (source_value);
-+  allowed = (priv->permission == NULL || g_permission_get_allowed (priv->permission)) ||
++  allowed = (priv->permission != NULL && g_permission_get_allowed (priv->permission)) ||
-+            (priv->tz_permission == NULL || g_permission_get_allowed (priv->tz_permission));
++            (priv->tz_permission != NULL && g_permission_get_allowed (priv->tz_permission));
 +
 +  g_value_set_boolean (target_value, !active && allowed);
 +
@@ -82,7 +82,7 @@ Index: gnome-control-center-3.14.1/panels/datetime/cc-datetime-panel.c
  switch_to_row_transform_func (GBinding        *binding,
                                const GValue    *source_value,
                                GValue          *target_value,
-@@ -1241,6 +1263,7 @@ cc_date_time_panel_init (CcDateTimePanel
+@@ -1266,6 +1288,7 @@ cc_date_time_panel_init (CcDateTimePanel
  
    /* add the lock button */
    priv->permission = polkit_permission_new_sync (DATETIME_PERMISSION, NULL, NULL, NULL);
@@ -90,7 +90,7 @@ Index: gnome-control-center-3.14.1/panels/datetime/cc-datetime-panel.c
    if (priv->permission != NULL)
      {
        g_signal_connect (priv->permission, "notify",
-@@ -1278,9 +1301,11 @@ cc_date_time_panel_init (CcDateTimePanel
+@@ -1303,9 +1326,11 @@ cc_date_time_panel_init (CcDateTimePanel
    gtk_widget_set_visible (W ("auto-datetime-row"), is_ntp_available (self));
  
    /* Timezone settings */

gnome-control-center.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Mon Dec 14 03:11:10 UTC 2015 - badshah400@gmail.com
+
+- Rebase
+  gnome-control-center-follow-polkit-permissions-for-tz.patch to
+  apply cleanly against g-c-c 3.18.2; re-enable patch in specfile
+  (boo#956879).
+
+-------------------------------------------------------------------
+Mon Dec 14 02:54:57 UTC 2015 - badshah400@gmail.com
+
+- Modify gnome-control-center-allow-extra-tools-in-shell.patch to
+  not include alacarte in the control center any longer, this
+  stopped working on gnome-shell a long time ago (boo#901843,
+  bgo#734237).
+- SLE still requires alacarte in their g-c-c, so add separate
+  patch gnome-control-center-add-alacarte-for-sle.patch and apply
+  it only for SLE 12 for now.
+
 -------------------------------------------------------------------
 Tue Nov 10 15:58:06 UTC 2015 - zaitor@opensuse.org
 

gnome-control-center.spec

@@ -39,6 +39,8 @@ Url:            http://www.gnome.org
 Source:         http://download.gnome.org/sources/gnome-control-center/3.18/%{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-SLE gnome-control-center-add-alacarte-for-sle.patch	 badshah400@gmail.com -- Add back alacarte for SLE since they require it for their classic mode, on the other hand for TW and other openSUSE versions it should be enough that alacarte is still available from shell overview, just not in the g-c-c shell. This patch must be applied only if required and then immediately after gnome-control-center-allow-extra-tools-in-shell.patch
+Patch100:       gnome-control-center-add-alacarte-for-sle.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
 Patch1:         gnome-control-center-hide-firewall-zone-entry.patch
 # PATCH-FEATURE-OPENSUSE gnome-control-center-allow-yast-in-shell.patch vuntz@opensuse.org -- Allow the launch of the yast shell from the g-c-c shell; it's quite ugly, but on the other hand, we don't want to change the behavior of the shell except for yast...
@@ -48,7 +50,7 @@ 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-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
+# 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
 BuildRequires:  cups-devel
 BuildRequires:  desktop-file-utils
@@ -185,13 +187,17 @@ GNOME control center.
 %setup -q
 translation-update-upstream
 %patch0 -p1
+# PATCH100 ONLY NEEDED FOR SLES AND TO BE APPLIED IMMEIDATELY AFTER PATCH0
+%if 0%{?suse_version} == 1315 && 0%{?sle_version}
+%patch100 -p1
+%endif
 %patch1 -p1
 # PATCH-NEEDS-REBASE - and g-c-c code seems to be moving in "our" direction see bgo#751378
 #patch15 -p1
 %if %{with_cacert_patch}
 %patch16 -p1
 %endif
-#%%patch17 -p1
+%patch17 -p1
 #NEEDS-REBASE
 #patch14 -p1