rpms/rt3070/F-12 blacklist-rt2800usb.conf, NONE, 1.1 rt3070.spec, 1.7, 1.8

[Orcan Ogetbil]

Author: oget

Update of /cvs/free/rpms/rt3070/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21589

Modified Files:
	rt3070.spec 
Added Files:
	blacklist-rt2800usb.conf 
Log Message:
* Fri Dec 04 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.1.0-3.1
- Blacklist kernel's rt2800usb module



--- NEW FILE blacklist-rt2800usb.conf ---
# This file comes with RPMFusion's rt2870 or rt3070 package.
# As of kernel 2.6.31, the module that comes with the kernel gets
# loaded for this device and it stops the device from working. So...
blacklist rt2800usb


Index: rt3070.spec
===================================================================
RCS file: /cvs/free/rpms/rt3070/F-12/rt3070.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rt3070.spec	4 Aug 2009 04:50:43 -0000	1.7
+++ rt3070.spec	4 Dec 2009 13:35:32 -0000	1.8
@@ -2,14 +2,18 @@
 
 Name:		rt3070
 Version:	2.1.1.0
-Release:	3%{?dist}
+Release:	3%{?dist}.1
 Summary:	Common files for RaLink rt3070 kernel driver
 Group:		System Environment/Kernel
 License:	GPLv2+
 URL:		http://www.ralinktech.com/ralink/Home/Support/Linux.html
 Source0:	http://www.ralinktech.com.tw/data/drivers/%{SourceName}.bz2
 Source1:	http://www.ralinktech.com.tw/data/drivers/ReleaseNote-RT3070.txt
+# Alternative suspend script. Might not be necessary anymore.
+# Kept for historical reasons.
 Source2:	suspend.sh
+# Blacklist the module shipped with kernel
+Source3:	blacklist-rt2800usb.conf
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -52,17 +56,24 @@
 
 cp -a %{SOURCE2} .
 
+install -dm 755 $RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.d/
+cp -a %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.d/
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README_STA* *.txt suspend.sh
+%doc README_STA_usb *.txt suspend.sh
 %dir %{_sysconfdir}/Wireless
 %dir %{_sysconfdir}/Wireless/RT3070STA
 %config(noreplace) %{_sysconfdir}/Wireless/RT3070STA/RT3070STA*.dat
+%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-rt2800usb.conf
 
 %changelog
+* Fri Dec 04 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.1.0-3.1
+- Blacklist kernel's rt2800usb module
+
 * Tue Aug 04 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.1.0-3
 - *sigh* Upstream made a release without bumping the version