Accepting request 221084 from home:tiwai:branches:hardware

- Remove superfluous iwlagn module config (bnc#831819)
- Fix build with openSUSE 12.2 and SLE11

OBS-URL: https://build.opensuse.org/request/show/221084
OBS-URL: https://build.opensuse.org/package/show/hardware/wireless-tools?expand=0&rev=28

wireless-tools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package wireless-tools
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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,14 +20,14 @@ Name:           wireless-tools
 Summary:        Tools for a wireless LAN
 License:        GPL-2.0
 Group:          Hardware/Wifi
-%define         major_version 30
 %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
-%{!?_udevrulesdir: %global _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d}
-Version:        %{major_version}.pre9
+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
@@ -40,7 +40,6 @@ Source6:        lwepgen.tar.bz2
 Source8:        iwlwifi-led.sh
 Source9:        99-iwlwifi-led.rules
 Source10:       iwl3945.modprobe
-Source11:       iwlagn.modprobe
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  openssl-devel
 %if %suse_version > 1220
@@ -125,7 +124,6 @@ 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
-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