From 22286b0ac621e10de1a81b8846503080e0b0d66b Mon Sep 17 00:00:00 2001 From: "Graydon, Tracy" Date: Fri, 18 May 2012 22:14:59 -0700 Subject: [PATCH] take two at packaging --- packaging/wpa_supplicant.changes | 18 ------------------ packaging/wpa_supplicant.spec | 17 ++++++++++++----- .../openssl-0.9.8-tls-extensions.patch | 0 .../openssl-0.9.8d-tls-extensions.patch | 0 .../openssl-0.9.8e-tls-extensions.patch | 0 .../openssl-0.9.8g-tls-extensions.patch | 0 .../openssl-0.9.8h-tls-extensions.patch | 0 .../openssl-0.9.8i-tls-extensions.patch | 0 .../openssl-0.9.9-session-ticket.patch | 0 9 files changed, 12 insertions(+), 23 deletions(-) rename {packaging => patches}/openssl-0.9.8-tls-extensions.patch (100%) rename {packaging => patches}/openssl-0.9.8d-tls-extensions.patch (100%) rename {packaging => patches}/openssl-0.9.8e-tls-extensions.patch (100%) rename {packaging => patches}/openssl-0.9.8g-tls-extensions.patch (100%) rename {packaging => patches}/openssl-0.9.8h-tls-extensions.patch (100%) rename {packaging => patches}/openssl-0.9.8i-tls-extensions.patch (100%) rename {packaging => patches}/openssl-0.9.9-session-ticket.patch (100%) diff --git a/packaging/wpa_supplicant.changes b/packaging/wpa_supplicant.changes index af042bd..1877ccd 100644 --- a/packaging/wpa_supplicant.changes +++ b/packaging/wpa_supplicant.changes @@ -1,21 +1,3 @@ -* Sat May 19 04:45:59 UTC 2012 - tracy.graydon@intel.com -- another fix - -* Sat May 19 04:37:53 UTC 2012 - tracy.graydon@intel.com -- fix spec - -* Sat May 19 04:24:31 UTC 2012 - tracy.graydon@intel.com -- test - -* Sat May 19 04:17:55 UTC 2012 - tracy.graydon@intel.com -- Fix packaging - -* Tue May 8 03:16:41 UTC 2012 - tracy.graydon@intel.com -- Fix patches for OBS - -* Fri May 04 2012 Lin Yang -- test release infrastructure - * Tue Jan 18 2011 Martin Xu - 0.7.3 - add patch wpa_s-alldrivers.patch to fix BMC #12576 diff --git a/packaging/wpa_supplicant.spec b/packaging/wpa_supplicant.spec index 7a14a6d..337ad9e 100644 --- a/packaging/wpa_supplicant.spec +++ b/packaging/wpa_supplicant.spec @@ -5,7 +5,7 @@ Release: 1 Group: System/Base License: BSD URL: http://w1.fi/wpa_supplicant/ -Source0: %{name}-%{version}.tar.bz2 +Source0: http://w1.fi/releases/%{name}-%{version}.tar.gz Source1: %{name}.config Patch0: 0001-eap_peer-create-a-libeap-library-with-header-files-a.patch Patch1: 0001-events-Custom-event-for-broadcom-proprietary-driver.patch @@ -26,6 +26,7 @@ with a WPA Authenticator and it controls the roaming and IEEE 802.11 authentication/association of the wlan driver. + %package -n libeap0 Summary: EAP-Peer runtime library Group: System/Libraries @@ -50,7 +51,7 @@ Development support for for EAP-Peer authentication library %prep -%setup -q +%setup -q -n %{name}-%{version} # 0001-eap_peer-create-a-libeap-library-with-header-files-a.patch %patch0 -p1 @@ -101,15 +102,21 @@ make -C src/eap_peer install DESTDIR=%{buildroot} mkdir -p %{buildroot}/%{_localstatedir}/run/%{name} # man pages -install -d %{buildroot}/%{_mandir}/man{5,8} -install -m 0644 %{name}/doc/docbook/*.8 %{buildroot}/%{_mandir}/man8 -install -m 0644 %{name}/doc/docbook/*.5 %{buildroot}/%{_mandir}/man5 +install -d %{buildroot}%{_mandir}/man{5,8} +install -m 0644 %{name}/doc/docbook/*.8 %{buildroot}%{_mandir}/man8 +install -m 0644 %{name}/doc/docbook/*.5 %{buildroot}%{_mandir}/man5 # some cleanup in docs rm -f %{name}/doc/.cvsignore rm -rf %{name}/doc/docbook + + + + + + %post -n libeap0 -p /sbin/ldconfig %postun -n libeap0 -p /sbin/ldconfig diff --git a/packaging/openssl-0.9.8-tls-extensions.patch b/patches/openssl-0.9.8-tls-extensions.patch similarity index 100% rename from packaging/openssl-0.9.8-tls-extensions.patch rename to patches/openssl-0.9.8-tls-extensions.patch diff --git a/packaging/openssl-0.9.8d-tls-extensions.patch b/patches/openssl-0.9.8d-tls-extensions.patch similarity index 100% rename from packaging/openssl-0.9.8d-tls-extensions.patch rename to patches/openssl-0.9.8d-tls-extensions.patch diff --git a/packaging/openssl-0.9.8e-tls-extensions.patch b/patches/openssl-0.9.8e-tls-extensions.patch similarity index 100% rename from packaging/openssl-0.9.8e-tls-extensions.patch rename to patches/openssl-0.9.8e-tls-extensions.patch diff --git a/packaging/openssl-0.9.8g-tls-extensions.patch b/patches/openssl-0.9.8g-tls-extensions.patch similarity index 100% rename from packaging/openssl-0.9.8g-tls-extensions.patch rename to patches/openssl-0.9.8g-tls-extensions.patch diff --git a/packaging/openssl-0.9.8h-tls-extensions.patch b/patches/openssl-0.9.8h-tls-extensions.patch similarity index 100% rename from packaging/openssl-0.9.8h-tls-extensions.patch rename to patches/openssl-0.9.8h-tls-extensions.patch diff --git a/packaging/openssl-0.9.8i-tls-extensions.patch b/patches/openssl-0.9.8i-tls-extensions.patch similarity index 100% rename from packaging/openssl-0.9.8i-tls-extensions.patch rename to patches/openssl-0.9.8i-tls-extensions.patch diff --git a/packaging/openssl-0.9.9-session-ticket.patch b/patches/openssl-0.9.9-session-ticket.patch similarity index 100% rename from packaging/openssl-0.9.9-session-ticket.patch rename to patches/openssl-0.9.9-session-ticket.patch -- 2.7.4