diff --git a/gnome-control-center-probe-radius-server-cert.patch b/gnome-control-center-probe-radius-server-cert.patch deleted file mode 100644 index e772020..0000000 --- a/gnome-control-center-probe-radius-server-cert.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/panels/network/network-dialogs.c b/panels/network/network-dialogs.c -index 0e5aae1..43fc119 100644 ---- a/panels/network/network-dialogs.c -+++ b/panels/network/network-dialogs.c -@@ -153,6 +153,11 @@ wireless_dialog_response_cb (GtkDialog *foo, - g_assert (connection); - g_assert (device); - -+ if (nma_wireless_dialog_need_cert_probe (dialog)) { -+ nma_wireless_dialog_probe_cert (dialog); -+ return; -+ } -+ - /* Find a similar connection and use that instead */ - all = nm_remote_settings_list_connections (closure->settings); - for (iter = all; iter; iter = g_slist_next (iter)) { diff --git a/gnome-control-center.changes b/gnome-control-center.changes index f82f965..adb154d 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 29 10:49:35 UTC 2013 - idonmez@suse.com + +- Drop gnome-control-center-probe-radius-server-cert.patch for now. + The patch is incomplete and breaks WPA-Enterprise completely + (bnc#798793) + ------------------------------------------------------------------- Thu Dec 27 17:46:07 UTC 2012 - mike.catanzaro@gmail.com diff --git a/gnome-control-center.spec b/gnome-control-center.spec index a7b3eb6..b318d82 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -1,7 +1,7 @@ # # spec file for package gnome-control-center # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -43,8 +43,6 @@ Patch3: gnome-control-center-fine-grained-tz-polkit.patch Patch14: gnome-control-center-system-proxy-configuration.patch # PATCH-FIX-UPSTREAM gcc-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- network: create private connections if the user if not authorized 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 BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -170,7 +168,6 @@ translation-update-upstream #NEEDS-REBASE #%patch14 -p1 %patch15 -p1 -%patch16 -p1 %if 0%{?BUILD_FROM_VCS} [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh