- improved install scripts (using install instead of mv and using $UID:
* install_acx100_firmware * install_intersil_firmware - updated URL in install_acx100_firmware script (bnc#1004577) - improved spec file * removed obsolete openSUSE Versions checks * replaced bash variables with macros * removed obsolete tags and macros * cleaned spec file with spec-cleaner OBS-URL: https://build.opensuse.org/package/show/hardware/wireless-tools?expand=0&rev=32
This commit is contained in:
Philipp Seiler
Git OBS Bridge
parent
fbdbdad88e
commit
167fb53a74
BIN
suse-files.tar.gz
(Stored with Git LFS)
BIN
suse-files.tar.gz
(Stored with Git LFS)
Binary file not shown.
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 22 11:25:21 UTC 2018 - p.seiler@linuxmail.org
|
||||
|
||||
- improved install scripts (using install instead of mv and using $UID:
|
||||
* install_acx100_firmware
|
||||
* install_intersil_firmware
|
||||
- updated URL in install_acx100_firmware script (bnc#1004577)
|
||||
- improved spec file
|
||||
* removed obsolete openSUSE Versions checks
|
||||
* replaced bash variables with macros
|
||||
* removed obsolete tags and macros
|
||||
* cleaned spec file with spec-cleaner
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Oct 18 19:28:00 UTC 2014 - Led <ledest@gmail.com>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package wireless-tools
|
||||
#
|
||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -16,23 +16,16 @@
|
||||
#
|
||||
|
||||
|
||||
%define _udevdir %(pkg-config --variable=udevdir udev)
|
||||
|
||||
Name: wireless-tools
|
||||
Version: 30.pre9
|
||||
Release: 0
|
||||
Summary: Tools for a wireless LAN
|
||||
License: GPL-2.0
|
||||
Group: Hardware/Wifi
|
||||
%if %suse_version > 1220
|
||||
%define _udevdir %(pkg-config --variable=udevdir udev)
|
||||
%{!?_udevrulesdir: %global _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d}
|
||||
%else
|
||||
%define _udevdir /lib/udev
|
||||
%define _udevrulesdir %{_udevdir}/rules.d
|
||||
%endif
|
||||
Version: 30.pre9
|
||||
Release: 0
|
||||
Url: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
|
||||
Source: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.%{version}.tar.gz
|
||||
Patch: wireless_tools.dif
|
||||
Patch1: lwepgen-as-needed.patch
|
||||
Source2: suse-files.tar.gz
|
||||
Source4: ipw2200.modprobe
|
||||
Source5: prism54.modprobe
|
||||
@ -40,16 +33,12 @@ Source6: lwepgen.tar.bz2
|
||||
Source8: iwlwifi-led.sh
|
||||
Source9: 99-iwlwifi-led.rules
|
||||
Source10: iwl3945.modprobe
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Patch0: wireless_tools.dif
|
||||
Patch1: lwepgen-as-needed.patch
|
||||
BuildRequires: openssl-devel
|
||||
%if %suse_version > 1220
|
||||
Requires: libiw = %{version}
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: pkgconfig(udev)
|
||||
%else
|
||||
BuildRequires: udev
|
||||
%endif
|
||||
|
||||
Requires: libiw = %{version}
|
||||
|
||||
%package -n libiw30
|
||||
Summary: Tools for a wireless LAN
|
||||
@ -58,7 +47,7 @@ Provides: libiw
|
||||
|
||||
%package -n libiw-devel
|
||||
Summary: Tools for a wireless LAN
|
||||
Group: Hardware/Wifi
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: glibc-devel
|
||||
Requires: libiw30 = %{version}
|
||||
|
||||
@ -67,66 +56,46 @@ This package contains the wireless tools, used to manipulate the
|
||||
wireless extensions. The wireless extension is an interface that allows
|
||||
you to set wireless LAN specific parameters and get specific stats.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Jean Tourrilhes <jt@hpl.hp.com>
|
||||
|
||||
%description -n libiw30
|
||||
This package contains the wireless tools, used to manipulate the
|
||||
wireless extensions. The wireless extension is an interface that allows
|
||||
you to set wireless LAN specific parameters and get specific stats.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Jean Tourrilhes <jt@hpl.hp.com>
|
||||
|
||||
%description -n libiw-devel
|
||||
This package contains the wireless tools, used to manipulate the
|
||||
wireless extensions. The wireless extension is an interface that allows
|
||||
you to set wireless LAN specific parameters and get specific stats.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Jean Tourrilhes <jt@hpl.hp.com>
|
||||
|
||||
%prep
|
||||
%setup6 -q -T -b 6 -n lwepgen
|
||||
%setup -q -T -b 6 -n lwepgen
|
||||
%setup -q -n wireless_tools.30
|
||||
%patch
|
||||
%patch0
|
||||
pushd ../lwepgen
|
||||
%patch1
|
||||
popd
|
||||
|
||||
%build
|
||||
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
|
||||
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" -C ../lwepgen
|
||||
make %{?_smp_mflags} CFLAGS="%{optflags}"
|
||||
make %{?_smp_mflags} CFLAGS="%{optflags}" -C ../lwepgen
|
||||
|
||||
%install
|
||||
mkdir -p %{buildroot}/%{_sbindir}
|
||||
mkdir -p %{buildroot}/sbin
|
||||
make INSTALL_DIR="${RPM_BUILD_ROOT}/%{_sbindir}" \
|
||||
INSTALL_INC="${RPM_BUILD_ROOT}/%{_includedir}" \
|
||||
INSTALL_LIB="${RPM_BUILD_ROOT}/%{_libdir}" \
|
||||
INSTALL_MAN="${RPM_BUILD_ROOT}/%{_mandir}" \
|
||||
DOCDIR=%{_defaultdocdir}/wireless-tools \
|
||||
PREFIX="${RPM_BUILD_ROOT}/usr" \
|
||||
install
|
||||
make INSTALL_DIR="%{buildroot}/%{_sbindir}" \
|
||||
INSTALL_INC="%{buildroot}/%{_includedir}" \
|
||||
INSTALL_LIB="%{buildroot}/%{_libdir}" \
|
||||
INSTALL_MAN="%{buildroot}/%{_mandir}" \
|
||||
DOCDIR=%{_defaultdocdir}/wireless-tools \
|
||||
PREFIX="%{buildroot}%{_prefix}" \
|
||||
install
|
||||
|
||||
tar -xvzf %{SOURCE2}
|
||||
install -m755 install_intersil_firmware %{buildroot}/usr/sbin
|
||||
install -m755 install_acx100_firmware %{buildroot}/usr/sbin
|
||||
install -m755 ../lwepgen/lwepgen %{buildroot}/usr/sbin
|
||||
mkdir -p %{buildroot}/etc/modprobe.d
|
||||
install -m644 %{SOURCE4} %{buildroot}/etc/modprobe.d/50-ipw2200.conf
|
||||
install -m644 %{SOURCE10} %{buildroot}/etc/modprobe.d/50-iwl3945.conf
|
||||
%ifarch %ix86 x86_64
|
||||
install -m644 %{SOURCE5} %{buildroot}/etc/modprobe.d/50-prism54.conf
|
||||
%endif
|
||||
install -m755 install_intersil_firmware %{buildroot}%{_sbindir}
|
||||
install -m755 install_acx100_firmware %{buildroot}%{_sbindir}
|
||||
install -m755 ../lwepgen/lwepgen %{buildroot}%{_sbindir}
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d
|
||||
install -m644 %{SOURCE4} %{buildroot}%{_sysconfdir}/modprobe.d/50-ipw2200.conf
|
||||
install -m644 %{SOURCE10} %{buildroot}%{_sysconfdir}/modprobe.d/50-iwl3945.conf
|
||||
install -m644 %{SOURCE5} %{buildroot}%{_sysconfdir}/modprobe.d/50-prism54.conf
|
||||
|
||||
mkdir -p %{buildroot}%{_udevdir}
|
||||
install -m755 %{SOURCE8} %{buildroot}%{_udevdir}/iwlwifi-led.sh
|
||||
mkdir -p %{buildroot}%{_udevrulesdir}
|
||||
@ -135,29 +104,25 @@ sed -i -e "s|@UDEVDIR@|%{_udevdir}|g" %{buildroot}%{_udevrulesdir}/99-iwlwifi-le
|
||||
%find_lang %{name} --with-man --all-name
|
||||
|
||||
%post -n libiw30 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libiw30 -p /sbin/ldconfig
|
||||
|
||||
%files -f %{name}.lang
|
||||
%defattr(-,root,root)
|
||||
%dir /etc/modprobe.d
|
||||
%doc CHANGELOG.h PCMCIA.txt README*
|
||||
%dir %{_sysconfdir}/modprobe.d
|
||||
%{_sbindir}/*
|
||||
%config /etc/modprobe.d/*
|
||||
%doc CHANGELOG.h INSTALL PCMCIA.txt README*
|
||||
%config %{_sysconfdir}/modprobe.d/*
|
||||
%{_udevdir}
|
||||
%{_udevdir}/iwlwifi-led.sh
|
||||
%dir %{_mandir}/cs
|
||||
%dir %{_mandir}/fr.ISO8859-1
|
||||
%dir %{_mandir}/fr.UTF-8
|
||||
%{_mandir}/man?/*.gz
|
||||
%{_mandir}/man?/*%{ext_man}
|
||||
%{_udevrulesdir}/99-iwlwifi-led.rules
|
||||
|
||||
%files -n libiw30
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libiw.so.*
|
||||
|
||||
%files -n libiw-devel
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libiw.so
|
||||
%{_includedir}/iwlib.h
|
||||
%{_includedir}/wireless.h
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user