Accepting request 27541 from hardware
Copy from hardware/wireless-tools based on submit request 27541 from user coolo OBS-URL: https://build.opensuse.org/request/show/27541 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wireless-tools?expand=0&rev=23
This commit is contained in:
committed by
Git OBS Bridge
parent
f8c24e0815
commit
f2344047d2
13
lwepgen-as-needed.patch
Normal file
13
lwepgen-as-needed.patch
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
Index: Makefile
|
||||||
|
===================================================================
|
||||||
|
--- Makefile.orig 2007-03-22 16:52:08.000000000 +0100
|
||||||
|
+++ Makefile 2009-09-22 20:34:04.000000000 +0200
|
||||||
|
@@ -4,7 +4,7 @@ CFLAGS ?= -O2 -Wall
|
||||||
|
default: lwepgen
|
||||||
|
|
||||||
|
lwepgen: lwepgen.c
|
||||||
|
- $(CC) $(CFLAGS) -lcrypto -o lwepgen lwepgen.c
|
||||||
|
+ $(CC) $(CFLAGS) -o lwepgen lwepgen.c -lcrypto
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -rf lwepgen
|
@@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Sep 22 20:37:49 CEST 2009 - crrodriguez@suse.de
|
||||||
|
|
||||||
|
- fix build with --as-needed
|
||||||
|
- fix -devel package dependencies
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Sep 17 00:26:54 CEST 2009 - crrodriguez@suse.de
|
||||||
|
|
||||||
|
- use find_lang macro
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Aug 20 09:26:23 UTC 2009 - aj@suse.de
|
Thu Aug 20 09:26:23 UTC 2009 - aj@suse.de
|
||||||
|
|
||||||
|
@@ -23,33 +23,34 @@ BuildRequires: openssl-devel udev
|
|||||||
Summary: Tools for a wireless LAN
|
Summary: Tools for a wireless LAN
|
||||||
%define major_version 30
|
%define major_version 30
|
||||||
Version: %{major_version}.pre8
|
Version: %{major_version}.pre8
|
||||||
Release: 4
|
Release: 5
|
||||||
Group: Hardware/Wifi
|
Group: Hardware/Wifi
|
||||||
License: GPL v2 or later
|
License: GPLv2+
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
Url: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
|
Url: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
Source: wireless_tools.%{version}.tar.bz2
|
Source: wireless_tools.%{version}.tar.bz2
|
||||||
Patch: wireless_tools.dif
|
Patch: wireless_tools.dif
|
||||||
|
Patch1: lwepgen-as-needed.patch
|
||||||
Source2: suse-files.tar.gz
|
Source2: suse-files.tar.gz
|
||||||
Source4: ipw2200.modprobe
|
Source4: ipw2200.modprobe
|
||||||
Source5: prism54.modprobe
|
Source5: prism54.modprobe
|
||||||
Source6: lwepgen.tar.bz2
|
Source6: lwepgen.tar.bz2
|
||||||
Source8: iwlwifi-led.sh
|
Source8: iwlwifi-led.sh
|
||||||
Source9: 99-iwlwifi-led.rules
|
Source9: 99-iwlwifi-led.rules
|
||||||
Requires: libiw = %{version}-%{release}
|
Requires: libiw = %{version}
|
||||||
|
|
||||||
%package -n libiw30
|
%package -n libiw30
|
||||||
License: GPL v2 or later
|
License: GPLv2+
|
||||||
Summary: Tools for a wireless LAN
|
Summary: Tools for a wireless LAN
|
||||||
Group: Hardware/Wifi
|
Group: Hardware/Wifi
|
||||||
Provides: libiw
|
Provides: libiw
|
||||||
|
|
||||||
%package -n libiw-devel
|
%package -n libiw-devel
|
||||||
License: GPL v2 or later
|
License: GPLv2+
|
||||||
Summary: Tools for a wireless LAN
|
Summary: Tools for a wireless LAN
|
||||||
Group: Hardware/Wifi
|
Group: Hardware/Wifi
|
||||||
Requires: libiw = %{version}-%{release}
|
Requires: libiw30 = %{version} glibc-devel
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This package contain the wireless tools, used to manipulate the
|
This package contain the wireless tools, used to manipulate the
|
||||||
@@ -88,11 +89,11 @@ Authors:
|
|||||||
%setup6 -q -T -b 6 -n lwepgen
|
%setup6 -q -T -b 6 -n lwepgen
|
||||||
%setup -q -n wireless_tools.30
|
%setup -q -n wireless_tools.30
|
||||||
%patch
|
%patch
|
||||||
|
pushd ../lwepgen
|
||||||
|
%patch1
|
||||||
|
popd
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# This package failed when testing with -Wl,-as-needed being default.
|
|
||||||
# So we disable it here, if you want to retest, just delete this comment and the line below.
|
|
||||||
export SUSE_ASNEEDED=0
|
|
||||||
make CFLAGS="$RPM_OPT_FLAGS"
|
make CFLAGS="$RPM_OPT_FLAGS"
|
||||||
make CFLAGS="$RPM_OPT_FLAGS" -C ../lwepgen
|
make CFLAGS="$RPM_OPT_FLAGS" -C ../lwepgen
|
||||||
|
|
||||||
@@ -119,6 +120,7 @@ mkdir -p %{buildroot}/lib/udev
|
|||||||
install -m755 %{SOURCE8} %{buildroot}/lib/udev/iwlwifi-led.sh
|
install -m755 %{SOURCE8} %{buildroot}/lib/udev/iwlwifi-led.sh
|
||||||
mkdir -p %{buildroot}/etc/udev/rules.d
|
mkdir -p %{buildroot}/etc/udev/rules.d
|
||||||
install -m644 %{SOURCE9} %{buildroot}/etc/udev/rules.d/99-iwlwifi-led.rules
|
install -m644 %{SOURCE9} %{buildroot}/etc/udev/rules.d/99-iwlwifi-led.rules
|
||||||
|
%find_lang %{name} --with-man --all-name
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
@@ -127,19 +129,17 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
%postun -n libiw30 -p /sbin/ldconfig
|
%postun -n libiw30 -p /sbin/ldconfig
|
||||||
|
|
||||||
%files
|
%files -f %{name}.lang
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%dir /etc/modprobe.d
|
%dir /etc/modprobe.d
|
||||||
%{_sbindir}/*
|
%{_sbindir}/*
|
||||||
%config /etc/modprobe.d/*
|
%config /etc/modprobe.d/*
|
||||||
%doc %attr(644,root,root) %{_mandir}/man*/*
|
%doc CHANGELOG.h INSTALL PCMCIA.txt README*
|
||||||
|
/lib/udev/iwlwifi-led.sh
|
||||||
%dir %{_mandir}/cs
|
%dir %{_mandir}/cs
|
||||||
%dir %{_mandir}/fr.ISO8859-1
|
%dir %{_mandir}/fr.ISO8859-1
|
||||||
%dir %{_mandir}/fr.UTF-8
|
%dir %{_mandir}/fr.UTF-8
|
||||||
%dir %{_mandir}/*/man*
|
%{_mandir}/man?/*.gz
|
||||||
%doc %attr(644,root,root) %{_mandir}/*/man*/*
|
|
||||||
%doc CHANGELOG.h INSTALL PCMCIA.txt README*
|
|
||||||
/lib/udev/iwlwifi-led.sh
|
|
||||||
%config /etc/udev/rules.d/99-iwlwifi-led.rules
|
%config /etc/udev/rules.d/99-iwlwifi-led.rules
|
||||||
|
|
||||||
%files -n libiw30
|
%files -n libiw30
|
||||||
|
Reference in New Issue
Block a user