From b15559825731b7056c5bb25feb386900e1f4e7aa Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 18 2014 12:37:33 +0000
Subject: import wpa_supplicant-2.0-13.el7


---

diff --git a/SPECS/wpa_supplicant.spec b/SPECS/wpa_supplicant.spec
index 65dc604..e2bd4af 100644
--- a/SPECS/wpa_supplicant.spec
+++ b/SPECS/wpa_supplicant.spec
@@ -7,7 +7,7 @@ Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
 Epoch: 1
 Version: 2.0
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: BSD
 Group: System Environment/Base
 Source0: http://w1.fi/releases/%{name}-%{version}%{rcver}%{snapshot}.tar.gz
@@ -18,10 +18,8 @@ Source4: %{name}.sysconfig
 Source6: %{name}.logrotate
 
 %define build_gui 1
-%define build_libeap 1
 %if 0%{?rhel} >= 1
 %define build_gui 0
-%define build_libeap 0
 %endif
 
 # distro specific customization and not suitable for upstream,
@@ -46,11 +44,6 @@ Patch8: rh837402-less-aggressive-roaming.patch
 Patch9: rh948453-man-page.patch
 # Don't evict current AP from PMKSA cache when it's large
 Patch10: rh1032758-fix-pmksa-cache-entry-clearing.patch
-%if %{build_libeap}
-# Dirty hack for WiMAX
-# http://linuxwimax.org/Download?action=AttachFile&do=get&target=wpa-1.5-README.txt
-Patch100: wpa_supplicant-2.0-generate-libeap-peer.patch
-%endif
 
 URL: http://w1.fi/wpa_supplicant/
 
@@ -86,25 +79,6 @@ Graphical User Interface for wpa_supplicant written using QT
 
 %endif
 
-%if %{build_libeap}
-%package -n libeap
-Summary: EAP peer library
-Group: System Environment/Libraries
-
-%description -n libeap
-This package contains the runtime EAP peer library. Don't use this
-unless you know what you're doing.
-
-%package -n libeap-devel
-Summary: Header files for EAP peer library
-Group: Development/Libraries
-Requires: libeap = %{epoch}:%{version}-%{release}
-
-%description -n libeap-devel
-This package contains header files for using the EAP peer library.
-Don't use this unless you know what you're doing.
-%endif
-
 %prep
 %setup -q -n %{name}-%{version}%{rcver}
 %patch0 -p1 -b .assoc-timeout
@@ -176,25 +150,6 @@ rm -f  %{name}/doc/.cvsignore
 rm -rf %{name}/doc/docbook
 chmod -R 0644 %{name}/examples/*.py
 
-%if %{build_libeap}
-# HAAACK
-patch -p1 -b --suffix .wimax < %{PATCH100}
-pushd wpa_supplicant
-  make clean
-
-  CFLAGS="${CFLAGS:-%optflags} -fPIC -DPIC" ; export CFLAGS ;
-  CXXFLAGS="${CXXFLAGS:-%optflags} -fPIC -DPIC" ; export CXXFLAGS ;
-  LDFLAGS="${LDFLAGS:-%optflags} -Wl,-z,now" ; export LDFLAGS ;
-  # yes, BINDIR=_sbindir
-  BINDIR="%{_sbindir}" ; export BINDIR ;
-  LIBDIR="%{_libdir}" ; export LIBDIR ;
-
-  make V=1 -C ../src/eap_peer
-  make DESTDIR=%{buildroot} LIB=%{_lib} -C ../src/eap_peer install
-  sed -i -e 's|libdir=/usr/lib|libdir=%{_libdir}|g' %{buildroot}/%{_libdir}/pkgconfig/*.pc
-popd
-%endif
-
 %post
 if [ $1 -eq 1 ] ; then 
     # Initial installation 
@@ -249,21 +204,10 @@ fi
 %{_bindir}/wpa_gui
 %endif
 
-%if %{build_libeap}
-%files -n libeap
-%{_libdir}/libeap.so.0*
-
-%files -n libeap-devel
-%{_includedir}/eap_peer
-%{_libdir}/libeap.so
-%{_libdir}/pkgconfig/*.pc
-
-%post -n libeap -p /sbin/ldconfig
-
-%postun -n libeap -p /sbin/ldconfig
-%endif
-
 %changelog
+* Mon Jul 14 2014 Thomas Haller <thaller@redhat.com - 1:2.0-13
+- cleanup spec file and remove obsolete libeap parts (rh #1085240)
+
 * Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 1:2.0-12
 - Mass rebuild 2014-01-24