[svn] r5451 - in trunk/rpms: dkms-ipw3945 ipw3945-firmware

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Thu May 31 12:58:04 CEST 2007


Author: thias
Date: 2007-05-31 12:58:03 +0200 (Thu, 31 May 2007)
New Revision: 5451

Modified:
   trunk/rpms/dkms-ipw3945/dkms-ipw3945.spec
   trunk/rpms/ipw3945-firmware/ipw3945-firmware.spec
Log:
Update ipw3945 driver to 1.2.1 and its firmware to 1.14.2.


Modified: trunk/rpms/dkms-ipw3945/dkms-ipw3945.spec
===================================================================
--- trunk/rpms/dkms-ipw3945/dkms-ipw3945.spec	2007-05-31 10:56:31 UTC (rev 5450)
+++ trunk/rpms/dkms-ipw3945/dkms-ipw3945.spec	2007-05-31 10:58:03 UTC (rev 5451)
@@ -4,14 +4,13 @@
 
 Summary: Driver for Intel® PRO/Wirelss 3945 network adaptors
 Name: dkms-ipw3945
-Version: 1.2.0
-Release: 3
+Version: 1.2.1
+Release: 1
 License: GPL
 Group: System Environment/Kernel
 URL: http://ipw3945.sourceforge.net/
 Source: http://dl.sf.net/ipw3945/ipw3945-%{version}.tgz
 Patch0: ipw3945-1.2.0-options.patch
-Patch1: ipw3945-1.2.0-read-rfkill-register.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 Requires: gcc, make
@@ -27,7 +26,6 @@
 %prep
 %setup -n ipw3945-%{version}
 %patch0 -p1
-%patch1 -p1
 
 
 %build
@@ -55,7 +53,7 @@
 EOF
 
 # File to set special compile options (created and used by our patch)
-%{__install} -p -D -m 0600 options.mak \
+%{__install} -p -D -m 0644 options.mak \
     %{buildroot}%{_sysconfdir}/sysconfig/ipw3945-options.mak
 
 
@@ -76,13 +74,17 @@
 
 
 %files
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %doc CHANGES ISSUES LICENSE* README.ipw3945
 %config(noreplace) %{_sysconfdir}/sysconfig/ipw3945-options.mak
 %{_usrsrc}/%{dkms_name}-%{dkms_vers}/
 
 
 %changelog
+* Fri May 18 2007 Matthias Saou <http://freshrpms.net/> 1.2.1-1
+- Update to 1.2.1.
+- Drop upstreamed previous patch.
+
 * Mon Jan 29 2007 Matthias Saou <http://freshrpms.net/> 1.2.0-3
 - Add RF kill deadlock patch (upstream #1096), Stefan Becker.
 

Modified: trunk/rpms/ipw3945-firmware/ipw3945-firmware.spec
===================================================================
--- trunk/rpms/ipw3945-firmware/ipw3945-firmware.spec	2007-05-31 10:56:31 UTC (rev 5450)
+++ trunk/rpms/ipw3945-firmware/ipw3945-firmware.spec	2007-05-31 10:58:03 UTC (rev 5451)
@@ -4,13 +4,14 @@
 
 Summary: Firmware for Intel® PRO/Wireless 3945 network adaptors
 Name: ipw3945-firmware
-Version: 1.13
+Version: 1.14.2
 Release: 1
 License: Distributable
 Group: System Environment/Kernel
 URL: http://bughost.org/ipw3945/
 Source0: http://bughost.org/ipw3945/ucode/ipw3945-ucode-%{version}.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: dos2unix
 BuildArch: noarch
 # Require the binary user space regulatory daemon, so that installing this
 # firmware package is enough
@@ -24,6 +25,9 @@
 
 %prep
 %setup -n ipw3945-ucode-%{version}
+%{__mv} LICENSE.ipw3945-ucode LICENSE
+%{__mv} README.ipw3945-ucode README
+dos2unix LICENSE README
 
 
 %build
@@ -39,12 +43,17 @@
 
 
 %files
-%defattr(-, root, root, 0755)
-%doc LICENSE.ipw3945-ucode README.ipw3945-ucode
+%defattr(-,root,root,-)
+%doc LICENSE README
 /lib/firmware/ipw3945.ucode
 
 
 %changelog
+* Thu Mar 30 2006 Matthias Saou <http://freshrpms.net> 1.14.2-1
+- Update to 1.14.2.
+- Remove suffix from LICENSE and README files.
+- Fix end of line encoding of LICENSE and README files with dos2unix.
+
 * Thu Mar 30 2006 Matthias Saou <http://freshrpms.net> 1.13-1
 - Initial RPM package, based on ipw2200-firmware.
 




More information about the commits mailing list