commit 867e45e1f7726b8dc2bd9c85ad22834a64570cb2
Author: Jan Rękorajski <[email protected]>
Date: Sun Sep 15 11:55:55 2019 +0200
- apply missing security patch
- build with qt5 by default
- rel 4
wpa_supplicant-lrelease5.patch | 11 +++++++++++
wpa_supplicant.spec | 13 ++++++++++---
2 files changed, 21 insertions(+), 3 deletions(-)
---
diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec
index dee577a..6c896b3 100644
--- a/wpa_supplicant.spec
+++ b/wpa_supplicant.spec
@@ -6,13 +6,13 @@
%bcond_without dbus # D-BUS control interface
%bcond_without gui # GUI (wpa_gui) package
%bcond_with pcsc # PC/SC support for smartcards
-%bcond_with qt5 # use Qt 5 instead of Qt 4
+%bcond_without qt5 # use Qt 5 instead of Qt 4
Summary: Linux WPA/WPA2/RSN/IEEE 802.1X supplicant
Summary(pl.UTF-8): Suplikant WPA/WPA2/RSN/IEEE 802.1X dla Linuksa
Name: wpa_supplicant
Version: 2.6
-Release: 3
+Release: 4
License: BSD
Group: Networking
Source0: http://w1.fi/releases/%{name}-%{version}.tar.gz
@@ -35,6 +35,7 @@ Patch9:
0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch
Patch10: 0006-TDLS-Reject-TPK-TK-reconfiguration.patch
Patch11: 0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch
Patch12: 0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch
+Patch13: %{name}-lrelease5.patch
URL: http://w1.fi/wpa_supplicant/
%{?with_dbus:BuildRequires: dbus-devel}
BuildRequires: libnl-devel >= 1:3.2
@@ -48,7 +49,7 @@ BuildRequires: rpmbuild(macros) >= 1.647
BuildRequires: Qt5Gui-devel >= 5
BuildRequires: Qt5Widgets-devel >= 5
BuildRequires: qt5-build >= 5
-BuildRequires: qt5-linguist >= 5
+BuildRequires: qt5-linguist >= 5.13.0-3
BuildRequires: qt5-qmake >= 5
%else
BuildRequires: QtGui-devel >= 4
@@ -147,7 +148,9 @@ Pliki programistyczne dla biblioteki eap.
%setup -q
%patch0 -p1
%patch1 -p1
+%if %{without qt5}
%patch2 -p0
+%endif
%patch3 -p1
%patch4 -p1
%patch5 -p1
@@ -157,6 +160,10 @@ Pliki programistyczne dla biblioteki eap.
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
+%if %{with qt5}
+%patch13 -p0
+%endif
%{__sed} -i -e 's,@LIB@,%{_lib},' src/eap_peer/libeap0.pc
diff --git a/wpa_supplicant-lrelease5.patch b/wpa_supplicant-lrelease5.patch
new file mode 100644
index 0000000..3feb164
--- /dev/null
+++ b/wpa_supplicant-lrelease5.patch
@@ -0,0 +1,11 @@
+--- wpa_supplicant/Makefile.orig 2010-09-08 15:34:15.413763615 +0100
++++ wpa_supplicant/Makefile 2010-09-08 15:36:34.555511910 +0100
+@@ -1357,7 +1357,7 @@
+ qmake -o wpa_gui-qt4/Makefile wpa_gui-qt4/wpa_gui.pro
+
+ wpa_gui-qt4/lang/wpa_gui_de.qm: wpa_gui-qt4/lang/wpa_gui_de.ts
+- lrelease wpa_gui-qt4/wpa_gui.pro
++ lrelease-qt5 wpa_gui-qt4/wpa_gui.pro
+
+ wpa_gui-qt4: wpa_gui-qt4/Makefile wpa_gui-qt4/lang/wpa_gui_de.qm
+ $(MAKE) -C wpa_gui-qt4
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wpa_supplicant.git/commitdiff/867e45e1f7726b8dc2bd9c85ad22834a64570cb2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
