[svn] r5061 - in trunk/rpms: dkms-ipw3945 ipw3945d
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Tue Jan 9 14:21:14 CET 2007
Author: thias
Date: 2007-01-09 14:21:14 +0100 (Tue, 09 Jan 2007)
New Revision: 5061
Added:
trunk/rpms/ipw3945d/11ipw3945
Removed:
trunk/rpms/dkms-ipw3945/ipw3945-1.1.0-ieee80211_api.patch
Modified:
trunk/rpms/dkms-ipw3945/dkms-ipw3945.spec
trunk/rpms/ipw3945d/ipw3945d.spec
Log:
Update ipw3945 to 1.2.0 and add PM hook for the daemon.
Modified: trunk/rpms/dkms-ipw3945/dkms-ipw3945.spec
===================================================================
--- trunk/rpms/dkms-ipw3945/dkms-ipw3945.spec 2007-01-09 13:03:59 UTC (rev 5060)
+++ trunk/rpms/dkms-ipw3945/dkms-ipw3945.spec 2007-01-09 13:21:14 UTC (rev 5061)
@@ -4,16 +4,15 @@
Summary: Driver for Intel® PRO/Wirelss 3945 network adaptors
Name: dkms-ipw3945
-Version: 1.1.2
+Version: 1.2.0
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.1.0-ieee80211_api.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch
-Requires: gcc
+Requires: gcc, make
Requires: ipw3945-firmware, ipw3945d
Requires(post): dkms
Requires(preun): dkms
@@ -25,7 +24,6 @@
%prep
%setup -n ipw3945-%{version}
-%patch0 -p1 -b .ieee80211_api
%build
@@ -76,6 +74,16 @@
%changelog
+* Tue Jan 9 2007 Matthias Saou <http://freshrpms.net/> 1.2.0-1
+- Update to 1.2.0.
+- Remove now included register and ESSID patches.
+- Remove no longer relevant 2.6.20 fixes patches.
+
+* Wed Dec 20 2006 Matthias Saou <http://freshrpms.net/> 1.1.3-2
+- Update to 1.1.3.
+- Include ESSID fix patch.
+- Include fixes for 2.6.20 but disabled since they break with earlier kernels.
+
* Mon Nov 27 2006 Matthias Saou <http://freshrpms.net/> 1.1.2-1
- Update to 1.1.2.
- Add versionned plain ipw3945 provides.
Deleted: trunk/rpms/dkms-ipw3945/ipw3945-1.1.0-ieee80211_api.patch
===================================================================
--- trunk/rpms/dkms-ipw3945/ipw3945-1.1.0-ieee80211_api.patch 2007-01-09 13:03:59 UTC (rev 5060)
+++ trunk/rpms/dkms-ipw3945/ipw3945-1.1.0-ieee80211_api.patch 2007-01-09 13:21:14 UTC (rev 5061)
@@ -1,23 +0,0 @@
-diff -Naupr ipw3945-1.1.0.orig/ipw3945.h ipw3945-1.1.0/ipw3945.h
---- ipw3945-1.1.0.orig/ipw3945.h 2006-07-14 20:52:16.000000000 +0200
-+++ ipw3945-1.1.0/ipw3945.h 2006-10-09 14:15:26.000000000 +0200
-@@ -29,7 +29,6 @@
-
- #include <linux/module.h>
- #include <linux/moduleparam.h>
--#include <linux/config.h>
- #include <linux/init.h>
-
- #include <linux/version.h>
-diff -Naupr ipw3945-1.1.0.orig/Makefile ipw3945-1.1.0/Makefile
---- ipw3945-1.1.0.orig/Makefile 2006-07-14 17:34:55.000000000 +0200
-+++ ipw3945-1.1.0/Makefile 2006-10-09 14:15:11.000000000 +0200
-@@ -90,7 +90,7 @@ IEEE80211_VER := $(shell $(DIR)/snapshot
- IEEE80211_API := $(shell sed -ne "s:\#define.*IEEE80211_API_VERSION[^0-9]*\([0-9]*\).*:\1:p" $(IEEE80211_PATH)net/ieee80211.h)
-
- ifeq ($(IEEE80211_API),)
-- IEEE80211_API := $(shell [[ "$(IEEE80211_VER)" == 1.1.14* ]] && \
-+ IEEE80211_API := $(shell [[ "$(IEEE80211_VER)" == *1.1.13* ]] && \
- { echo "2" ; } || \
- { ver=$(IEEE80211_VER); ver=$${ver\#*.} ; echo $${ver%.*} ; })
- EXTRA_CFLAGS += -DIEEE80211_API_VERSION=$(IEEE80211_API)
Added: trunk/rpms/ipw3945d/11ipw3945
===================================================================
--- trunk/rpms/ipw3945d/11ipw3945 (rev 0)
+++ trunk/rpms/ipw3945d/11ipw3945 2007-01-09 13:21:14 UTC (rev 5061)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+case "$1" in
+ hibernate|suspend)
+ /sbin/lsmod | grep -q ipw3945 || exit 0
+ { /sbin/service ipw3945d stop && /sbin/modprobe -r ipw3945 ; } 2>/dev/null
+ ;;
+ thaw|resume)
+ { /sbin/modprobe ipw3945 && /sbin/service ipw3945d start ; } 2>/dev/null
+ ;;
+ *)
+ ;;
+esac
+
+exit $?
Property changes on: trunk/rpms/ipw3945d/11ipw3945
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/rpms/ipw3945d/ipw3945d.spec
===================================================================
--- trunk/rpms/ipw3945d/ipw3945d.spec 2007-01-09 13:03:59 UTC (rev 5060)
+++ trunk/rpms/ipw3945d/ipw3945d.spec 2007-01-09 13:21:14 UTC (rev 5061)
@@ -9,12 +9,13 @@
Summary: Regulatory Daemon for Intel® PRO/Wireless 3945 network adaptors
Name: ipw3945d
Version: 1.7.22
-Release: 3
+Release: 4
License: Distributable
Group: System Environment/Kernel
URL: http://bughost.org/ipw3945/
Source0: http://bughost.org/ipw3945/daemon/ipw3945d-%{version}.tgz
-Source1: ipw3945d.init
+Source1: 11ipw3945
+Source2: ipw3945d.init
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
ExclusiveArch: i386 x86_64
@@ -42,8 +43,11 @@
%ifarch x86_64
%{__install} -D -p -m 0755 x86_64/ipw3945d %{buildroot}/sbin/ipw3945d
%endif
+# Install PM hook
+%{__install} -D -p -m 0755 %{SOURCE1} \
+ %{buildroot}%{_sysconfdir}/pm/hooks/11ipw3945
# Install init script
-%{__install} -D -p -m 0755 %{SOURCE1} \
+%{__install} -D -p -m 0755 %{SOURCE2} \
%{buildroot}%{_sysconfdir}/rc.d/init.d/ipw3945d
@@ -69,11 +73,15 @@
%files
%defattr(-, root, root, 0755)
%doc LICENSE.ipw3945d README.ipw3945d
+%{_sysconfdir}/pm/hooks/11ipw3945
%{_sysconfdir}/rc.d/init.d/ipw3945d
/sbin/ipw3945d
%changelog
+* Tue Jan 9 2007 Matthias Saou <http://freshrpms.net/> 1.7.22-4
+- Include PM hook from Ralf Ertzinger for suspend and hibernate to work.
+
* Tue Oct 24 2006 Matthias Saou <http://freshrpms.net/> 1.7.22-3
- Fix preun scriplet (missing "fi", doh!).
More information about the svn-commits
mailing list