Accepting request 412331 from home:scarabeus_iv:branches:hardware

- Remove support for <12.3 as we are unresolvable there anyway
- Use qt5 on 13.2 if someone pulls this package in
- Convert to pkgconfig dependencies over the devel pkgs
- Use the %qmake5 macro to build the qt5 gui

OBS-URL: https://build.opensuse.org/request/show/412331
OBS-URL: https://build.opensuse.org/package/show/hardware/wpa_supplicant?expand=0&rev=66

wpa_supplicant.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jul 20 11:54:37 UTC 2016 - tchvatal@suse.com
+
+- Remove support for <12.3 as we are unresolvable there anyway
+- Use qt5 on 13.2 if someone pulls this package in
+- Convert to pkgconfig dependencies over the devel pkgs
+- Use the %qmake5 macro to build the qt5 gui
+
 -------------------------------------------------------------------
 Wed Mar 23 16:45:16 UTC 2016 - lnussel@suse.de
 

wpa_supplicant.spec

@@ -16,9 +16,6 @@
 #
 
 
-%if ! %{defined _rundir}
-%define _rundir %{_localstatedir}/run
-%endif
 Name:           wpa_supplicant
 Version:        2.5
 Release:        0
@@ -41,25 +38,18 @@ Patch1:         wpa_supplicant-flush-debug-output.patch
 Patch2:         wpa_supplicant-sigusr1-changes-debuglevel.patch
 Patch3:         wpa_supplicant-alloc_size.patch
 Patch4:         wpa_supplicant-getrandom.patch
-BuildRequires:  dbus-1-devel
-BuildRequires:  libnl3-devel
-%if 0%{?suse_version} < 1320
-BuildRequires:  libqt4
-BuildRequires:  libqt4-devel
-%else
+BuildRequires:  openssl-devel
+BuildRequires:  pkgconfig
+BuildRequires:  readline-devel
+BuildRequires:  systemd-rpm-macros
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5Widgets)
-%endif
-BuildRequires:  openssl-devel
-BuildRequires:  pkg-config
-BuildRequires:  readline-devel
+BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(libnl-3.0)
 Requires:       logrotate
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} > 1230
-BuildRequires:  systemd-rpm-macros
-%systemd_requires
-%endif
+%{?systemd_requires}
 
 %description
 wpa_supplicant is an implementation of the WPA Supplicant component,
@@ -84,15 +74,12 @@ cp %{SOURCE1} wpa_supplicant/.config
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+
 %build
 cd wpa_supplicant
 CFLAGS="%{optflags}" make V=1 %{?_smp_mflags}
 cd wpa_gui-qt4
-%if 0%{?suse_version} < 1320
-qmake QMAKE_CXXFLAGS="%{optflags}" QMAKE_CFLAGS="%{optflags}"
-%else
-qmake-qt5 QMAKE_CXXFLAGS="%{optflags}" QMAKE_CFLAGS="%{optflags}"
-%endif
+%qmake5
 make %{?_smp_mflags}
 
 %install
@@ -117,19 +104,15 @@ rm %{buildroot}%{_mandir}/man8/wpa_priv.*
 rm %{buildroot}%{_mandir}/man8/eapol_test.*
 install -m 0644 wpa_supplicant/doc/docbook/*.5 %{buildroot}%{_mandir}/man5
 install -m 755 wpa_supplicant/wpa_gui-qt4/wpa_gui %{buildroot}%{_sbindir}
-%if 0%{?suse_version} > 1230
 install -d %{buildroot}%{_unitdir}
 install -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}
-%endif
+ln -s service %{buildroot}/%{_sbindir}/rcwpa_supplicant
 # avoid spurious dependency on /usr/bin/python
 chmod -x wpa_supplicant/examples/*.py
-%if 0%{?suse_version} > 1230
 # dbus auto activation boo#966535
 ln -s wpa_supplicant.service %{buildroot}%{_unitdir}/dbus-fi.epitest.hostap.WPASupplicant.service
 ln -s wpa_supplicant.service %{buildroot}%{_unitdir}/dbus-fi.w1.wpa_supplicant1.service
-%endif
 
-%if 0%{?suse_version} > 1230
 %pre
 %service_add_pre wpa_supplicant.service
 
@@ -141,11 +124,11 @@ ln -s wpa_supplicant.service %{buildroot}%{_unitdir}/dbus-fi.w1.wpa_supplicant1.
 
 %postun
 %service_del_postun wpa_supplicant.service
-%endif
 
 %files
 %defattr(-,root,root)
 %doc wpa_supplicant/ChangeLog COPYING README wpa_supplicant/todo.txt wpa_supplicant/examples wpa_supplicant/wpa_supplicant.conf
+%{_sbindir}/rcwpa_supplicant
 %{_sbindir}/wpa_cli
 %{_sbindir}/wpa_passphrase
 %{_sbindir}/wpa_supplicant
@@ -154,14 +137,10 @@ ln -s wpa_supplicant.service %{buildroot}%{_unitdir}/dbus-fi.w1.wpa_supplicant1.
 %config %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/wpa_supplicant
 %dir %{_rundir}/%{name}
-%if 0%{?suse_version} > 1140
 %ghost %{_rundir}/%{name}
-%endif
-%if 0%{?suse_version} > 1230
 %{_unitdir}/wpa_supplicant.service
 %{_unitdir}/dbus-fi.epitest.hostap.WPASupplicant.service
 %{_unitdir}/dbus-fi.w1.wpa_supplicant1.service
-%endif
 %dir %{_sysconfdir}/%{name}
 %{_mandir}/man8/*
 %exclude %{_mandir}/man8/wpa_gui.*
@@ -170,6 +149,6 @@ ln -s wpa_supplicant.service %{buildroot}%{_unitdir}/dbus-fi.w1.wpa_supplicant1.
 %files gui
 %defattr(-,root,root)
 %{_sbindir}/wpa_gui
-%{_mandir}/man8/wpa_gui.*
+%{_mandir}/man8/wpa_gui*
 
 %changelog