Accepting request 212204 from network:utilities

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/212204
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/netcontrol?expand=0&rev=12

0002-allow-wicked.patch

@@ -0,0 +1,26 @@
+From e6d8442f1e0b83dab40b5132d086069b2610778a Mon Sep 17 00:00:00 2001
+From: Marius Tomaschewski <mt@suse.de>
+Date: Wed, 4 Sep 2013 10:44:23 +0200
+Subject: [PATCH] Allow netconfig use with wicked as network.service
+
+---
+ src/backend-suse.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/backend-suse.c b/src/backend-suse.c
+index d335816..dff529a 100644
+--- a/src/backend-suse.c
++++ b/src/backend-suse.c
+@@ -560,7 +560,8 @@ __netcontrol_enabled(nc_handle_t *nh)
+ 	int   enabled = 0;
+ 
+ 	if( __nc_suse_config_get_network_service(nh, &service) == 0) {
+-		if (service && strcmp(service, "network.service") == 0)
++		if (nc_string_eq(service, "wicked.service") ||
++		    nc_string_eq(service, "network.service"))
+ 			enabled = 1;
+ 		nc_string_free(&service);
+ 	}
+-- 
+1.8.1.4
+

netcontrol.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Dec 17 16:40:46 UTC 2013 - mt@suse.de
+
+- Applied a minimal 0002-allow-wicked.patch to accept wicked
+  as the network service (fate#316768).
+- Renamed libnl3.patch to 0001-use-libnl3.patch
+
 -------------------------------------------------------------------
 Fri Oct 25 09:41:22 UTC 2013 - idonmez@suse.com
 

netcontrol.spec

@@ -31,8 +31,10 @@ Group:          Productivity/Networking/System
 #
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        baselibs.conf
-# PATCH-FIX-UPSTREAM libnl3.patch -- Fixes bnc#845540
-Patch1:         libnl3.patch
+# PATCH-FIX-UPSTREAM 0001-use-libnl3.patch -- Fixes bnc#845540
+Patch1:         0001-use-libnl3.patch
+# PATCH-FIX-UPSTREAM 0002-allow-wicked.patch -- fate#316768
+Patch2:         0002-allow-wicked.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} >= 1310
 BuildRequires:  autoconf
@@ -107,6 +109,7 @@ Authors:
 %if 0%{?suse_version} >= 1310
 %patch1 -p1
 %endif
+%patch2 -p1
 
 %build
 export CFLAGS="-W -Wall $RPM_OPT_FLAGS"