SPECS: wpa_supplicant.spec - seds 2 patches, OPT renamed to OPTCFLAGS
sparky
sparky at pld-linux.org
Thu Aug 3 21:34:16 CEST 2006
Author: sparky Date: Thu Aug 3 19:34:16 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- seds 2 patches, OPT renamed to OPTCFLAGS
---- Files affected:
SPECS:
wpa_supplicant.spec (1.32 -> 1.33)
---- Diffs:
================================================================
Index: SPECS/wpa_supplicant.spec
diff -u SPECS/wpa_supplicant.spec:1.32 SPECS/wpa_supplicant.spec:1.33
--- SPECS/wpa_supplicant.spec:1.32 Thu Aug 3 01:41:29 2006
+++ SPECS/wpa_supplicant.spec Thu Aug 3 21:34:11 2006
@@ -26,6 +26,8 @@
Source2: %{name}-wpa_gui.desktop
Patch0: %{name}-makefile.patch
Patch1: %{name}-0.4.7_dscape-02.patch
+Patch2: %{name}-OPTCFLAGS.patch
+Patch3: %{name}-kill-dynamic_eap_methods.patch
URL: http://hostap.epitest.fi/wpa_supplicant/
%{?with_madwifi:BuildRequires: madwifi-devel}
BuildRequires: ncurses-devel
@@ -35,7 +37,6 @@
BuildRequires: qt-devel
%endif
BuildRequires: readline-devel
-BuildRequires: sed >= 4.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -97,9 +98,8 @@
%setup -q
%patch0 -p1
%patch1 -p1
-sed -e 's#-O2#$(OPT)#g' \
- -e '/ALL/s/dynamic_eap_methods//' \
- -i Makefile
+%patch2 -p1
+%patch3 -p1
install %{SOURCE1} .config
@@ -111,7 +111,7 @@
%{__make} \
CC="%{__cc}" \
LDFLAGS="%{rpmldflags}" \
- OPT="%{rpmcflags}"
+ OPTCFLAGS="%{rpmcflags}"
%if %{with gui}
%{__make} wpa_gui \
@@ -120,7 +120,7 @@
CC="%{__cc}" \
CXX="%{__cxx}" \
LDFLAGS="%{rpmldflags}" \
- OPT="%{rpmcflags}"
+ OPTCFLAGS="%{rpmcflags}"
%endif
%install
@@ -161,6 +161,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.33 2006/08/03 19:34:11 sparky
+- seds 2 patches, OPT renamed to OPTCFLAGS
+
Revision 1.32 2006/08/02 23:41:29 sparky
- pass %{rpmldflags}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/wpa_supplicant.spec?r1=1.32&r2=1.33&f=u
More information about the pld-cvs-commit
mailing list