pool/wireless-tools
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 155491 from home:rmilasan:branches:hardware

Browse Source 
- Move iwlwifi-led.sh to where udev is installed using pkg-config.
  Apply the same thing also for 99-iwlwifi-led.rules (only 
  openSUSE 12.3 and up).

OBS-URL: https://build.opensuse.org/request/show/155491
OBS-URL: https://build.opensuse.org/package/show/hardware/wireless-tools?expand=0&rev=23
This commit is contained in:
Andreas Jaeger
2013-02-15 10:40:18 +00:00
committed by Git OBS Bridge
parent 495b3f6f50
commit 041b258bc9
3 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
99-iwlwifi-led.rules
View File

@@ -1,2 +1,2 @@
SUBSYSTEM=="leds", ACTION=="add", KERNEL=="iwl-phy*:assoc", RUN+="/lib/udev/iwlwifi-led.sh"
SUBSYSTEM=="leds", ACTION=="add", KERNEL=="iwl-phy*:assoc", RUN+="@UDEVDIR@/iwlwifi-led.sh"

7
wireless-tools.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Feb 15 09:25:08 UTC 2013 - rmilasan@suse.com
- Move iwlwifi-led.sh to where udev is installed using pkg-config.
Apply the same thing also for 99-iwlwifi-led.rules (only
openSUSE 12.3 and up).
-------------------------------------------------------------------
Fri Jul 6 13:26:33 UTC 2012 - cfarrell@suse.com

24
wireless-tools.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package wireless-tools
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,12 @@ Name: wireless-tools
Summary: Tools for a wireless LAN
License: GPL-2.0
Group: Hardware/Wifi
%define major_version 30
%define major_version 30
%if %suse_version > 1220
%define _udevdir %(pkg-config --variable=udevdir udev)
%else
%define _udevdir /lib/udev
%endif
Version: %{major_version}.pre9
Release: 0
Url: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
@@ -38,7 +43,12 @@ Source10: iwl3945.modprobe
Source11: iwlagn.modprobe
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: openssl-devel
%if %suse_version > 1220
BuildRequires: pkgconfig
BuildRequires: pkgconfig(udev)
%else
BuildRequires: udev
%endif
Requires: libiw = %{version}
@@ -108,7 +118,7 @@ make INSTALL_DIR="${RPM_BUILD_ROOT}/%{_sbindir}" \
DOCDIR=%{_defaultdocdir}/wireless-tools \
PREFIX="${RPM_BUILD_ROOT}/usr" \
install
tar -xvvzf %{SOURCE2}
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
@@ -119,10 +129,11 @@ install -m644 %{SOURCE11} %{buildroot}/etc/modprobe.d/50-iwlagn.conf
%ifarch %ix86 x86_64
install -m644 %{SOURCE5} %{buildroot}/etc/modprobe.d/50-prism54.conf
%endif
mkdir -p %{buildroot}/lib/udev
install -m755 %{SOURCE8} %{buildroot}/lib/udev/iwlwifi-led.sh
mkdir -p %{buildroot}%{_udevdir}
install -m755 %{SOURCE8} %{buildroot}%{_udevdir}/iwlwifi-led.sh
mkdir -p %{buildroot}/etc/udev/rules.d
install -m644 %{SOURCE9} %{buildroot}/etc/udev/rules.d/99-iwlwifi-led.rules
sed -i -e "s|@UDEVDIR@|%{_udevdir}|g" %{buildroot}/etc/udev/rules.d/99-iwlwifi-led.rules
%find_lang %{name} --with-man --all-name
%post -n libiw30 -p /sbin/ldconfig
@@ -135,7 +146,8 @@ install -m644 %{SOURCE9} %{buildroot}/etc/udev/rules.d/99-iwlwifi-led.rules
%{_sbindir}/*
%config /etc/modprobe.d/*
%doc CHANGELOG.h INSTALL PCMCIA.txt README*
/lib/udev/iwlwifi-led.sh
%{_udevdir}
%{_udevdir}/iwlwifi-led.sh
%dir %{_mandir}/cs
%dir %{_mandir}/fr.ISO8859-1
%dir %{_mandir}/fr.UTF-8