OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wireless-tools?expand=0&rev=19

ipw2100.modprobe

@@ -1 +0,0 @@
-options ipw2100 associate=0

ipw2200.modprobe

@@ -1 +1 @@
-options ipw2200 hwcrypto=0 led=1 associate=0
+options ipw2200 hwcrypto=0 led=1

wireless-tools.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Jun  8 17:18:14 CEST 2009 - hschaa@suse.de
+
+- Remove ipw2100.modprobe, the associate parameter already defaults
+  to 0 since 2.6.30
+- Update ipw2200.modprobe, the associate parameter already defaults
+  to 0 since 2.6.30
+
+-------------------------------------------------------------------
+Thu Jun  4 09:49:53 CEST 2009 - hschaa@suse.de
+
+- Split libiw30 and libiw-devel out of wireless-tools
+
 -------------------------------------------------------------------
 Mon Mar 23 10:16:23 CET 2009 - hschaa@suse.de
 

wireless-tools.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package wireless-tools (Version 30.pre8)
+# spec file for package wireless-tools (Version MACRO)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -21,9 +21,9 @@
 Name:           wireless-tools
 BuildRequires:  openssl-devel udev
 Summary:        Tools for a wireless LAN
-Version:        30.pre8
+%define major_version 30
+Version:        %{major_version}.pre8
 Release:        1
-%define wlanng_version 0.2.5
 Group:          Hardware/Wifi
 License:        GPL v2 or later
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -35,9 +35,24 @@ Source2:        suse-files.tar.gz
 Source4:        ipw2200.modprobe
 Source5:        prism54.modprobe
 Source6:        lwepgen.tar.bz2
-Source7:        ipw2100.modprobe
 Source8:        iwlwifi-led.sh
 Source9:        99-iwlwifi-led.rules
+Requires:       libiw = %{version}-%{release}
+# this "requires" should be removed when all dependent packages 
+# got reviewed and depend on libiw* instead of wireless-tools
+Requires:       libiw-devel = %{version}-%{release}
+
+%package -n libiw30
+License:        GPL v2 or later
+Summary:        Tools for a wireless LAN
+Group:          Hardware/Wifi
+Provides:       libiw
+
+%package -n libiw-devel
+License:        GPL v2 or later
+Summary:        Tools for a wireless LAN
+Group:          Hardware/Wifi
+Requires:       libiw = %{version}-%{release}
 
 %description
 This package contain the wireless tools, used to manipulate the
@@ -46,6 +61,28 @@ you to set wireless LAN specific parameters and get specific stats.
 
 
 
+Authors:
+--------
+    Jean Tourrilhes <jt@hpl.hp.com>
+
+%description -n libiw30
+This package contain 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 contain 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>
@@ -75,7 +112,6 @@ 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 %{SOURCE7} %{buildroot}/etc/modprobe.d/50-ipw2100.conf
 %ifarch %ix86 x86_64
 install -m644 %{SOURCE5} %{buildroot}/etc/modprobe.d/50-prism54.conf
 %endif
@@ -87,17 +123,15 @@ install -m644 %{SOURCE9} %{buildroot}/etc/udev/rules.d/99-iwlwifi-led.rules
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
+%post -n libiw30 -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun -n libiw30 -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
 %dir /etc/modprobe.d
 %{_sbindir}/*
-%{_libdir}/lib*
+%config /etc/modprobe.d/*
-%{_includedir}/*
-/etc/modprobe.d/*
 %doc %attr(644,root,root) %{_mandir}/man*/*
 %dir %{_mandir}/cs
 %dir %{_mandir}/fr.ISO8859-1
@@ -106,9 +140,25 @@ rm -rf $RPM_BUILD_ROOT
 %doc %attr(644,root,root) %{_mandir}/*/man*/*
 %doc CHANGELOG.h INSTALL PCMCIA.txt README*
 /lib/udev/iwlwifi-led.sh
-/etc/udev/rules.d/99-iwlwifi-led.rules
+%config /etc/udev/rules.d/99-iwlwifi-led.rules
+
+%files -n libiw30
+%defattr(-,root,root)
+%{_libdir}/libiw.so.*
+
+%files -n libiw-devel
+%defattr(-,root,root)
+%{_libdir}/libiw.so
+%{_includedir}/*
 
 %changelog
+* Mon Jun 08 2009 hschaa@suse.de
+- Remove ipw2100.modprobe, the associate parameter already defaults
+  to 0 since 2.6.30
+- Update ipw2200.modprobe, the associate parameter already defaults
+  to 0 since 2.6.30
+* Thu Jun 04 2009 hschaa@suse.de
+- Split libiw30 and libiw-devel out of wireless-tools
 * Mon Mar 23 2009 hschaa@suse.de
 - Update install_acx100_firmware and install_intersil_firmware
   (bnc#486195)
@@ -882,7 +932,7 @@ rm -rf $RPM_BUILD_ROOT
 - dropped obsolete patches for ipw2200
 - building seperate ieee80211-modules for ipw2100 and ipw2200
   as they are not compatible currently
-* Tue Sep 28 2004 jg@suse.de
+* Wed Sep 29 2004 jg@suse.de
 - ipw2100: update to 0.55, changes:
   * Fixed rmmod oops in ieee80211
   * Merged in WPA code