rpms/staging-kmod/F-15 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 staging-kmod.spec, 1.30, 1.31

[Thorsten Leemhuis]

Author: thl

Update of /cvs/free/rpms/staging-kmod/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16139

Modified Files:
	.cvsignore sources staging-kmod.spec 
Log Message:
rebase to spec file from f16 for 2.6.41


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-15/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Aug 2011 17:59:53 -0000	1.5
+++ .cvsignore	13 Nov 2011 09:04:17 -0000	1.6
@@ -1 +1 @@
-linux-staging-2.6.40.tar.bz2
+linux-staging-3.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-15/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2011 17:59:53 -0000	1.5
+++ sources	13 Nov 2011 09:04:17 -0000	1.6
@@ -1 +1 @@
-11e75c74635ef4862d1b126a77583dde  linux-staging-2.6.40.tar.bz2
+20d4d99f2db296b376243621a25c02df  linux-staging-3.1.tar.bz2


Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-15/staging-kmod.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- staging-kmod.spec	2 Nov 2011 10:17:31 -0000	1.30
+++ staging-kmod.spec	13 Nov 2011 09:04:18 -0000	1.31
@@ -1,7 +1,7 @@
 # akmods not supported
 
 # which drivers to built
-%global stgdrvs ASUS_OLED ATH6K_LEGACY BATMAN_ADV BRCMUTIL BCM_WIMAX DRM_PSB EASYCAP ECHO EPL ET131X FB_UDL FB_XGI FT1000_USB  HECI HYPERV IDE_PHISON  INTEL_MEI LINE6_USB RTS_PSTOR RAMZSWAP R8187SE R8712U RTL8192SU RTL8192E RTL8192U SBE_2T3E3 SLICOSS SOLO6X10 TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 USB_ENESTORAGE W35UND PRISM2_USB VT6655 VT6656 XVMALLOC ZRAM ZCACHE 
+%global stgdrvs ASUS_OLED ATH6K_LEGACY BATMAN_ADV BCM_WIMAX DRM_PSB EASYCAP ECHO EPL ET131X FB_UDL FB_XGI FT1000_USB  HECI HYPERV IDE_PHISON  INTEL_MEI LINE6_USB RTS_PSTOR RAMZSWAP R8187SE R8712U RTL8192SU RTL8192E RTL8192U SBE_2T3E3 SLICOSS SOLO6X10 TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 USB_ENESTORAGE W35UND PRISM2_USB VT6655 VT6656 XVMALLOC ZRAM ZCACHE 
 
 # avoid this error: 
 # /usr/lib/rpm/debugedit: canonicalization unexpectedly shrank by one character
@@ -19,8 +19,8 @@
 #global prever rc8
 
 Name:          staging-kmod
-Version:       2.6.40
-Release:       %{?prever:0.}4%{?prever:.%{prever}}%{?dist}.6
+Version:       3.1
+Release:       %{?prever:0.}2%{?prever:.%{prever}}%{?dist}.1
 Summary:       Selected kernel modules from linux-staging
 
 Group:         System Environment/Kernel
@@ -66,9 +66,6 @@
  for module in %{stgdrvs} ; do 
    configops="CONFIG_${module}=m"
    case "${module}" in
-     BRCMUTIL)
-       configops="${configops} CONFIG_BRCMSMAC=m CONFIG_BRCMFMAC=m"
-       ;;
      CX25821)
        configops="${configops} CONFIG_CX25821_ALSA=m"
        ;;
@@ -137,23 +134,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Wed Nov 02 2011 Nicolas Chauvet <kwizart at gmail.com> - 2.6.40-4.6
-- rebuild for updated kernel
-
-* Sun Oct 30 2011 Nicolas Chauvet <kwizart at gmail.com> - 2.6.40-4.5
-- rebuild for updated kernel
-
-* Wed Oct 19 2011 Nicolas Chauvet <kwizart at gmail.com> - 2.6.40-4.4
-- rebuild for updated kernel
-
-* Fri Oct 07 2011 Nicolas Chauvet <kwizart at gmail.com> - 2.6.40-4.3
-- rebuild for updated kernel
+* Sun Nov 13 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.1-2.1
+- Drop brcm80211 drivers; included in Fedora kernels since 3.1.1-1.rc1 with 
+  changelog-enty "Backport brcm80211 from 3.2-rc1"
 
-* Sat Sep 03 2011 Nicolas Chauvet <kwizart at gmail.com> - 2.6.40-4.2
-- rebuild for updated kernel
-
-* Wed Aug 17 2011 Nicolas Chauvet <kwizart at gmail.com> - 2.6.40-4.1
-- rebuild for updated kernel
+* Sun Nov 06 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.1-1.1
+- update to 3.1 (no new drivers)
 
 * Fri Aug 05 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.40-4
 - fix BRCM drivers by building their util module for real