[svn] r4833 - in trunk/rpms: ipw2100-firmware ipw2200-firmware

[packagers at lists.rpmforge.net]

Author: thias
Date: 2006-10-17 13:46:04 +0200 (Tue, 17 Oct 2006)
New Revision: 4833

Modified:
   trunk/rpms/ipw2100-firmware/ipw2100-firmware.spec
   trunk/rpms/ipw2200-firmware/ipw2200-firmware.spec
Log:
Move ipw2*00 LICENSE file to comply with the redistribution terms.


Modified: trunk/rpms/ipw2100-firmware/ipw2100-firmware.spec
===================================================================
--- trunk/rpms/ipw2100-firmware/ipw2100-firmware.spec	2006-10-17 11:20:16 UTC (rev 4832)
+++ trunk/rpms/ipw2100-firmware/ipw2100-firmware.spec	2006-10-17 11:46:04 UTC (rev 4833)
@@ -5,7 +5,7 @@
 Summary: Firmware for Intel® PRO/Wireless 2100 network adaptors
 Name: ipw2100-firmware
 Version: 1.3
-Release: 2
+Release: 3
 License: Distributable
 Group: System Environment/Kernel
 URL: http://ipw2100.sourceforge.net/firmware.php
@@ -15,9 +15,9 @@
 BuildArch: noarch
 
 %description
-This package contains the firmware files required by the ipw-2100 driver for
-Linux. Usage of the firmware is subject to the terms contained in :
-%{_defaultdocdir}/%{name}-%{version}/LICENSE. Please read it carefully.
+This package contains the firmware files required by the ipw2100 driver for
+Linux. Usage of the firmware is subject to the terms and conditions contained
+in /lib/firmware/LICENSE.ipw2100. Please read it carefully.
 
 
 %prep
@@ -30,7 +30,9 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}/lib/firmware
+# Terms state that the LICENSE *must* be in the same directory as the firmware
 %{__install} -p -m 0644 *.fw %{buildroot}/lib/firmware/
+%{__install} -p -m 0644 LICENSE %{buildroot}/lib/firmware/LICENSE.ipw2100
 
 
 %clean
@@ -39,11 +41,15 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc LICENSE
+%doc /lib/firmware/LICENSE.ipw2100
 /lib/firmware/*.fw
 
 
 %changelog
+* Tue Oct 17 2006 Matthias Saou <http://freshrpms.net> 1.3-3
+- Move the LICENSE as LICENSE.ipw2100 in the firmware directory to fully
+  comply to the Intel redistribution terms and conditions.
+
 * Mon Jan  2 2006 Matthias Saou <http://freshrpms.net> 1.3-2
 - Convert spec file to UTF-8.
 - Remove all symlinks to keep only /lib/firmware like in ipw2200-firmware.

Modified: trunk/rpms/ipw2200-firmware/ipw2200-firmware.spec
===================================================================
--- trunk/rpms/ipw2200-firmware/ipw2200-firmware.spec	2006-10-17 11:20:16 UTC (rev 4832)
+++ trunk/rpms/ipw2200-firmware/ipw2200-firmware.spec	2006-10-17 11:46:04 UTC (rev 4833)
@@ -5,11 +5,11 @@
 Summary: Firmware for Intel® PRO/Wireless 2200 network adaptors
 Name: ipw2200-firmware
 Version: 3.0
-Release: 2
+Release: 3
 License: Distributable
 Group: System Environment/Kernel
 URL: http://ipw2200.sourceforge.net/firmware.php
-# License agreement is displayed before download (referer protection)
+# License agreement must be displayed before download (referer protection)
 Source0: ipw2200-fw-%{version}.tgz
 Source1: ipw2200-fw-2.4.tgz
 Source2: ipw2200-fw-2.3.tgz
@@ -19,8 +19,8 @@
 
 %description
 This package contains the firmware files required by the ipw2200 driver for
-Linux. Usage of the firmware is subject to the terms contained in :
-%{_defaultdocdir}/%{name}-%{version}/LICENSE. Please read it carefully.
+Linux. Usage of the firmware is subject to the terms and conditions contained
+in /lib/firmware/LICENSE.ipw2200. Please read it carefully.
 
 
 %prep
@@ -33,7 +33,9 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}/lib/firmware
+# Terms state that the LICENSE *must* be in the same directory as the firmware
 %{__install} -p -m 0644 *.fw %{buildroot}/lib/firmware/
+%{__install} -p -m 0644 LICENSE %{buildroot}/lib/firmware/LICENSE.ipw2200
 
 
 %clean
@@ -42,11 +44,15 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc LICENSE
+%doc /lib/firmware/LICENSE.ipw2200
 /lib/firmware/*.fw
 
 
 %changelog
+* Tue Oct 17 2006 Matthias Saou <http://freshrpms.net> 3.0-3
+- Move the LICENSE as LICENSE.ipw2200 in the firmware directory to fully
+  comply to the Intel redistribution terms and conditions.
+
 * Sun Jun 25 2006 Matthias Saou <http://freshrpms.net> 3.0-2
 - Fix inclusion of the 3.0 firmware files.