From 39f5664865b2a8e247d6cefbf8e55999aef287ad195bf9d17c7b5e7c806ca142 Mon Sep 17 00:00:00 2001
From: Karol Babioch <karol@babioch.de>
Date: Fri, 2 Nov 2018 13:22:42 +0000
Subject: [PATCH] osc copypac from project:hardware package:wpa_supplicant
 revision:90

OBS-URL: https://build.opensuse.org/package/show/hardware/wpa_supplicant?expand=0&rev=92
---
 wpa_supplicant.changes  |  6 ------
 wpa_supplicant.service  |  5 +++--
 wpa_supplicant.spec     | 10 +++++++---
 wpa_supplicant@.service |  5 +++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/wpa_supplicant.changes b/wpa_supplicant.changes
index b22d9a1..c3ee1cd 100644
--- a/wpa_supplicant.changes
+++ b/wpa_supplicant.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Fri Nov  2 09:50:48 UTC 2018 - Илья Индиго <ilya@ilya.pp.ua>
-
-- Refresh spec-file: add %license tag.
-- Service start after network.target. (need for systemd-networkd)
-
 -------------------------------------------------------------------
 Tue Oct 16 06:45:59 UTC 2018 - Karol Babioch <kbabioch@suse.com>
 
diff --git a/wpa_supplicant.service b/wpa_supplicant.service
index 7d31463..e08030d 100644
--- a/wpa_supplicant.service
+++ b/wpa_supplicant.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=WPA Supplicant daemon
-After=dbus.service network.target
-Wants=network.target
+Before=network.target
+After=dbus.service
 
 [Service]
 Type=dbus
@@ -10,3 +10,4 @@ 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..54b0b16 100644
--- a/wpa_supplicant.spec
+++ b/wpa_supplicant.spec
@@ -22,7 +22,7 @@ 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/
+Url:            http://hostap.epitest.fi/wpa_supplicant/
 Source:         http://hostap.epitest.fi/releases/wpa_supplicant-%{version}.tar.gz
 Source1:        config
 Source2:        %{name}.conf
@@ -40,6 +40,7 @@ Patch2:         wpa_supplicant-sigusr1-changes-debuglevel.patch
 Patch3:         wpa_supplicant-alloc_size.patch
 Patch4:         wpa_supplicant-getrandom.patch
 Patch5:         wpa_supplicant-dump-certificate-as-PEM-in-debug-mode.diff
+
 Patch10:        rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
 Patch11:        rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch
 Patch12:        rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch
@@ -55,6 +56,7 @@ Patch21:        wpa_supplicant-log-file-permission.patch
 Patch22:        wpa_supplicant-log-file-cloexec.patch
 Patch23:        wpa_supplicant-git-fa67debf4c6ddbc881a212b175faa6d5d0d90c8c.patch
 Patch24:        wpa_supplicant-git-f5b74b966c942feb95a8ddbb7d130540b15b796d.patch
+
 BuildRequires:  openssl-devel
 BuildRequires:  pkgconfig
 BuildRequires:  readline-devel
@@ -65,6 +67,7 @@ BuildRequires:  pkgconfig(Qt5Widgets)
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(libnl-3.0)
 Requires:       logrotate
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{?systemd_requires}
 
 %description
@@ -160,8 +163,8 @@ ln -s wpa_supplicant.service %{buildroot}%{_unitdir}/dbus-fi.w1.wpa_supplicant1.
 %service_del_postun wpa_supplicant.service
 
 %files
-%license COPYING
-%doc wpa_supplicant/ChangeLog README wpa_supplicant/todo.txt wpa_supplicant/examples wpa_supplicant/wpa_supplicant.conf
+%defattr(-,root,root)
+%doc wpa_supplicant/ChangeLog COPYING README wpa_supplicant/todo.txt wpa_supplicant/examples wpa_supplicant/wpa_supplicant.conf
 %{_sbindir}/eapol_test
 %{_sbindir}/rcwpa_supplicant
 %{_sbindir}/wpa_cli
@@ -183,6 +186,7 @@ ln -s wpa_supplicant.service %{buildroot}%{_unitdir}/dbus-fi.w1.wpa_supplicant1.
 %{_mandir}/man5/*
 
 %files gui
+%defattr(-,root,root)
 %{_sbindir}/wpa_gui
 %{_mandir}/man8/wpa_gui*
 
diff --git a/wpa_supplicant@.service b/wpa_supplicant@.service
index c9fc545..90d4029 100644
--- a/wpa_supplicant@.service
+++ b/wpa_supplicant@.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=WPA Supplicant daemon (interface %i)
-After=dbus.service network.target
-Wants=network.target
+Before=network.target
+After=dbus.service
 
 [Service]
 Type=dbus
@@ -10,3 +10,4 @@ ExecStart=/usr/sbin/wpa_supplicant -i%i -c /etc/wpa_supplicant/wpa_supplicant.co
 
 [Install]
 WantedBy=multi-user.target
+