Accepting request 88367 from GNOME:Factory

Update to 3.2.1 - bugfixes (forwarded request 88358 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/88367
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-control-center?expand=0&rev=66

gnome-control-center-3.2.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ef1539de1515315519680ec1c456ba91dc2a87a3a706ce9c6540113277eaf068
-size 4953991

gnome-control-center-3.2.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:da90ed4ff15dfde4625d46d028825ada8e090f0ace0f9a8baacaa6acc40e5bb5
+size 5003078

gnome-control-center-network-allocate-nm-connection.patch

@@ -7,19 +7,16 @@ Subject: [PATCH] network: allocate nm-connection for nma-wireless-dialog
  panels/network/network-dialogs.c |    2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)
 
-diff --git a/panels/network/network-dialogs.c b/panels/network/network-dialogs.c
+Index: gnome-control-center-3.2.1/panels/network/network-dialogs.c
-index d446dbd..196c6ef 100644
+===================================================================
---- a/panels/network/network-dialogs.c
+--- gnome-control-center-3.2.1.orig/panels/network/network-dialogs.c
-+++ b/panels/network/network-dialogs.c
++++ gnome-control-center-3.2.1/panels/network/network-dialogs.c
-@@ -281,6 +281,8 @@ cc_network_panel_connect_to_8021x_network (CcNetworkPanel   *panel,
+@@ -283,6 +283,8 @@ cc_network_panel_connect_to_8021x_networ
-                 return;
+ 
-         }
+         connection = nm_connection_new ();
  
 +        connection = nm_connection_new ();
 +
          /* Need a UUID for the "always ask" stuff in the Dialog of Doom */
          s_con = (NMSettingConnection *) nm_setting_connection_new ();
          uuid = nm_utils_uuid_generate ();
--- 
-1.7.3.4
-

gnome-control-center-setup-wpa-eap-no-active-ap.patch

@@ -1,32 +0,0 @@
-From 3df3e35ff97e569523f0a6b96fecb253a7f39aed Mon Sep 17 00:00:00 2001
-From: Gary Ching-Pang Lin <chingpang@gmail.com>
-Date: Wed, 12 Oct 2011 16:33:53 +0800
-Subject: [PATCH] network: show wireless dialog even if there is no active AP
-
-The network panel ignored the request of showing the wireless
-dialog if there is no active AP, and the user was not able to
-set up the advanced wireless settings, such as WPA-EAP settings.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=661526
----
- panels/network/cc-network-panel.c |    4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
-
-diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
-index 6698d86..e3c8e27 100644
---- a/panels/network/cc-network-panel.c
-+++ b/panels/network/cc-network-panel.c
-@@ -911,9 +911,7 @@ add_access_point (CcNetworkPanel *panel, NMAccessPoint *ap, NMAccessPoint *activ
-                             -1);
- 
-         /* is this what we're on already? */
--        if (active == NULL)
--                return;
--        if (nm_utils_same_ssid (ssid, nm_access_point_get_ssid (active), TRUE)) {
-+        if (active && nm_utils_same_ssid (ssid, nm_access_point_get_ssid (active), TRUE)) {
-                 widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
-                                                              "combobox_wireless_network_name"));
-                 gtk_combo_box_set_active_iter (GTK_COMBO_BOX (widget), &treeiter);
--- 
-1.7.3.4
-

gnome-control-center.changes

@@ -1,3 +1,50 @@
+-------------------------------------------------------------------
+Mon Oct 17 18:10:24 CEST 2011 - dimstar@opensuse.org
+
+- Update to version 3.2.1:
+  + Common:
+    - Always collect locales from the directory (bgo#660725)
+  + Color:
+    - After removing a profile select the device so the UI is
+      correct (bgo#661658)
+  + Date & time:
+    - Fix showing actual clock format on panel open
+  + Info:
+    - Use new GtkAppChooserButton API (bgo#658693)
+    - Use x-content/unix-software as mime for the Software combobox
+  + Network:
+    - Allocate nm-connection for nma-wireless-dialog (bgo#648174)
+    - Show wireless dialog even if there is no active AP
+      (bgo#661526)
+  + Printers:
+    - Check state of CUPS after start (bgo#659721)
+    - Fix build on systems without LC_PAPER (bgo#660692)
+    - Don't hide address entry
+    - Disable remove button if no printer is selected (bgo#659724)
+    - Hide spinner after search (bgo#659753)
+    - Make +/- buttons insensitive when can not connect to CUPS
+  + Region:
+    - Hide system tab if no localed
+    - Simplify getting the current Locale
+    - Implement copying layouts (bgo#659300)
+    - Fix build on systems without LC_MEASUREMENT (bgo#660787)
+    - Only show locales for languages that have translations
+  + Screen:
+    - Never set gnome-session's idle-delay to 1
+  + Shell:
+    - Use gtk_widget_show instead of _show_all in
+      gnome_control_center_show
+    - Show the label for the category sections
+    - Make sure we gtk_widget_show the search view
+    - Make Ctrl+Q work outside the overview
+    - Give focus to the search entry when showing the overview page
+    - Don't crash when loading the icon fails (bgo#660513)
+  + Updated translations.
+- Drop gnome-control-center-setup-wpa-eap-no-active-ap.patch: fixed
+  upstream.
+- Drop gnome-control-center-network-allocate-nm-connection.patch:
+  fixed upstream.
+
 -------------------------------------------------------------------
 Wed Oct 12 08:49:59 UTC 2011 - glin@suse.com
 

gnome-control-center.spec

@@ -64,7 +64,7 @@ License:        GPLv2+
 Group:          System/GUI/GNOME
 Obsoletes:      fontilus themus acme
 Provides:       fontilus themus acme
-Version:        3.2.0
+Version:        3.2.1
 Release:        1
 Summary:        The GNOME Control Center
 Source:         http://download.gnome.org/sources/gnome-control-center/3.2/%{name}-%{version}.tar.bz2
@@ -74,10 +74,6 @@ Patch0:         gnome-control-center-allow-yast-in-shell.patch
 Patch1:         gnome-control-center-shell-no-crash.patch
 # PATCH-NEEDS-REBASE gnome-control-center-system-proxy-configuration.patch -- this needs to be reimplemented to be more distro-generic before submitting upstream - docs at http://en.opensuse.org/GNOME/Proxy_configuration (was PATCH-FEATURE-OPENSUSE)
 Patch14:        gnome-control-center-system-proxy-configuration.patch
-# PATCH-FIX-UPSTREAM gnome-control-center-network-allocate-nm-connection.patch bgo#648174 glin@suse.com -- Allocate nm-connection for nma-wireless-dialog
-Patch15:        gnome-control-center-network-allocate-nm-connection.patch
-# PATCH-FIX-UPSTREAM gnome-control-center-setup-wpa-eap-no-active-ap.patch bgo#61526 glin@suse.com -- Do not ignore the wireless dialog request regardless of whether there is an active AP or not
-Patch16:        gnome-control-center-setup-wpa-eap-no-active-ap.patch
 Url:            http://www.gnome.org
 Requires:       %{name}-branding = %{version}
 # needed for printers panel
@@ -161,8 +157,6 @@ translation-update-upstream
 %patch1 -p1
 #NEEDS-REBASE
 #%patch14 -p1
-%patch15 -p1
-%patch16 -p1
 
 %if 0%{?BUILD_FROM_VCS}
 [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh