From 76b2d2e9d406e66b81e612bee1955973aa169eb0b02b3d67561db61cdd009c8f Mon Sep 17 00:00:00 2001
From: Karol Babioch <karol@babioch.de>
Date: Mon, 29 Jul 2019 13:10:56 +0000
Subject: [PATCH] Accepting request 719580 from home:13ilya

- Refresh spec-file via spec-cleaner and manual optimizations.
  * Change URL and Source0 to actual project homepage.
  * Remove macro %{?systemd_requires} and rm (not needed).
  * Add %autopatch macro.
  * Add %make_build macro.
- Chenged patch wpa_supplicant-flush-debug-output.patch (to -p1).
- Changed service-files for start after network (systemd-networkd).

OBS-URL: https://build.opensuse.org/request/show/719580
OBS-URL: https://build.opensuse.org/package/show/hardware/wpa_supplicant?expand=0&rev=95
---
 wpa_supplicant-flush-debug-output.patch |  4 ++--
 wpa_supplicant.changes                  | 11 +++++++++
 wpa_supplicant.service                  |  4 +---
 wpa_supplicant.spec                     | 31 ++++---------------------
 wpa_supplicant@.service                 |  4 +---
 5 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/wpa_supplicant-flush-debug-output.patch b/wpa_supplicant-flush-debug-output.patch
index 737f97c..6762a91 100644
--- a/wpa_supplicant-flush-debug-output.patch
+++ b/wpa_supplicant-flush-debug-output.patch
@@ -1,7 +1,7 @@
 Index: src/utils/wpa_debug.c
 ===================================================================
---- src/utils/wpa_debug.c.orig
-+++ src/utils/wpa_debug.c
+--- a/src/utils/wpa_debug.c
++++ b/src/utils/wpa_debug.c
 @@ -45,6 +45,7 @@ void wpa_debug_print_timestamp(void)
  	if (out_file) {
  		fprintf(out_file, "%ld.%06u: ", (long) tv.sec,
diff --git a/wpa_supplicant.changes b/wpa_supplicant.changes
index 0444509..0db326c 100644
--- a/wpa_supplicant.changes
+++ b/wpa_supplicant.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Jul 29 12:08:59 UTC 2019 - Илья Индиго <ilya@ilya.pp.ua>
+
+- Refresh spec-file via spec-cleaner and manual optimizations.
+  * Change URL and Source0 to actual project homepage.
+  * Remove macro %{?systemd_requires} and rm (not needed).
+  * Add %autopatch macro.
+  * Add %make_build macro.
+- Chenged patch wpa_supplicant-flush-debug-output.patch (to -p1).
+- Changed service-files for start after network (systemd-networkd).
+
 -------------------------------------------------------------------
 Fri Nov  2 09:50:48 UTC 2018 - Илья Индиго <ilya@ilya.pp.ua>
 
diff --git a/wpa_supplicant.service b/wpa_supplicant.service
index e08030d..d9c8d15 100644
--- a/wpa_supplicant.service
+++ b/wpa_supplicant.service
@@ -1,7 +1,6 @@
 [Unit]
 Description=WPA Supplicant daemon
-Before=network.target
-After=dbus.service
+After=dbus.service network.target
 
 [Service]
 Type=dbus
@@ -10,4 +9,3 @@ ExecStart=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -u
 
 [Install]
 WantedBy=multi-user.target
-
diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec
index 0a61e26..c92ab4f 100644
--- a/wpa_supplicant.spec
+++ b/wpa_supplicant.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package wpa_supplicant
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,8 +22,8 @@ Release:        0
 Summary:        WPA supplicant implementation
 License:        BSD-3-Clause AND GPL-2.0-or-later
 Group:          Productivity/Networking/Other
-URL:            http://hostap.epitest.fi/wpa_supplicant/
-Source:         http://hostap.epitest.fi/releases/wpa_supplicant-%{version}.tar.gz
+URL:            https://w1.fi/wpa_supplicant
+Source0:        https://w1.fi/releases/%{name}-%{version}.tar.gz
 Source1:        config
 Source2:        %{name}.conf
 Source3:        fi.epitest.hostap.WPASupplicant.service
@@ -65,7 +65,6 @@ BuildRequires:  pkgconfig(Qt5Widgets)
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(libnl-3.0)
 Requires:       logrotate
-%{?systemd_requires}
 
 %description
 wpa_supplicant is an implementation of the WPA Supplicant component,
@@ -84,28 +83,8 @@ implementation of the WPA Supplicant component.
 
 %prep
 %setup -q -n wpa_supplicant-%{version}
-rm -rf wpa_supplicant-%{version}/patches
 cp %{SOURCE1} wpa_supplicant/.config
-%patch1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
+%autopatch -p1
 
 %build
 cd wpa_supplicant
@@ -113,7 +92,7 @@ CFLAGS="%{optflags}" make V=1 %{?_smp_mflags}
 CFLAGS="%{optflags}" make V=1 %{?_smp_mflags} eapol_test
 cd wpa_gui-qt4
 %qmake5
-make %{?_smp_mflags}
+%make_build
 
 %install
 install -d %{buildroot}/%{_sbindir}
diff --git a/wpa_supplicant@.service b/wpa_supplicant@.service
index 90d4029..62d34ec 100644
--- a/wpa_supplicant@.service
+++ b/wpa_supplicant@.service
@@ -1,7 +1,6 @@
 [Unit]
 Description=WPA Supplicant daemon (interface %i)
-Before=network.target
-After=dbus.service
+After=dbus.service network.target
 
 [Service]
 Type=dbus
@@ -10,4 +9,3 @@ ExecStart=/usr/sbin/wpa_supplicant -i%i -c /etc/wpa_supplicant/wpa_supplicant.co
 
 [Install]
 WantedBy=multi-user.target
-