rpms/staging-kmod/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 staging-kmod.spec, 1.23, 1.24

[Thorsten Leemhuis]

Author: thl

Update of /cvs/free/rpms/staging-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28261/devel

Modified Files:
	.cvsignore sources staging-kmod.spec 
Log Message:
sync F-16 to devel, F-17 and F-15


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Nov 2011 11:31:38 -0000	1.5
+++ .cvsignore	4 Apr 2012 16:20:15 -0000	1.6
@@ -1 +1 @@
-linux-staging-3.1.tar.bz2
+linux-staging-3.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Nov 2011 11:31:38 -0000	1.5
+++ sources	4 Apr 2012 16:20:15 -0000	1.6
@@ -1 +1 @@
-20d4d99f2db296b376243621a25c02df  linux-staging-3.1.tar.bz2
+7080bd32b25b30a6c57694d846e6cecc  linux-staging-3.3.tar.bz2


Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/devel/staging-kmod.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- staging-kmod.spec	7 Feb 2012 21:58:32 -0000	1.23
+++ staging-kmod.spec	4 Apr 2012 16:20:15 -0000	1.24
@@ -1,7 +1,7 @@
 # akmods not supported
 
 # which drivers to built
-%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 
+%global stgdrvs ASUS_OLED BCM_WIMAX EASYCAP ECHO EPL ET131X FB_UDL FB_XGI FT1000_USB  HECI IDE_PHISON  INTEL_MEI LINE6_USB RTS_PSTOR RAMZSWAP R8187SE R8712U RTL8192SU RTL8192E RTL8192U RTS5139 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:       3.1
-Release:       %{?prever:0.}2%{?prever:.%{prever}}%{?dist}.2
+Version:       3.3
+Release:       %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.3
 Summary:       Selected kernel modules from linux-staging
 
 Group:         System Environment/Kernel
@@ -52,9 +52,6 @@
 # disable drivers that are enabled in Fedora's kernel, as those otherweise would get build
 sed -i 's|.*DABUSB.*||; s|.*SE401.*||;  s|.*VICAM.*||; s|.CRYSTALH||; s|.*LIRC.*||;' linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/Makefile
 
-# fix include for BRCM80211
-sed -i 's!-Idrivers/staging/brcm80211/!-I$(obj)/../!' linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/brcm80211/*/Makefile
-
 # seperate directories for each kernel variant (PAE, non-PAE, ...) we build the modules for
 for kernel_version in %{?kernel_versions} ; do
  cp -a linux-staging-%{version}%{?prever:-%{prever}}/ _kmod_build_${kernel_version%%___*}
@@ -72,10 +69,6 @@
      FT1000_USB)
        configops="${configops} CONFIG_FT1000_USB=m CONFIG_FT1000_PCMCIA=m"
        ;;
-     HYPERV)
-       ( [[ "%{_target_cpu}" == "ppc" ]] || [[ "%{_target_cpu}" == "ppc64" ]] ) && continue
-       configops="${configops} CONFIG_${module}_STORAGE=m CONFIG_${module}_BLOCK=m CONFIG_${module}_NET=m"
-       ;;
      PRISM2_USB)
        # does not build on ppc and ppc64 as of 011109; tested with 2.6.31.5
        ( [[ "%{_target_cpu}" == "ppc" ]] || [[ "%{_target_cpu}" == "ppc64" ]] ) && continue
@@ -134,8 +127,60 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Tue Feb 07 2012 Nicolas Chauvet <kwizart at gmail.com> - 3.1-2.2
-- Rebuild for UsrMove
+* Tue Apr 03 2012 Nicolas Chauvet <kwizart at gmail.com> - 3.3-1.3
+- rebuild for updated kernel
+
+* Fri Mar 30 2012 Nicolas Chauvet <kwizart at gmail.com> - 3.3-1.2
+- rebuild for updated kernel
+
+* Wed Mar 21 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.3-1.1
+- update to 3.3
+- disable the HV driver, as HYPERV is not set in Fedora
+
+* Tue Jan 24 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.2.1-1.1
+- update to 3.2.1
+- drop ATH6K_LEGACY (replaced by a proper driver)
+- drop DRM_PSB (enabled in Fedora)
+- add RTS5139
+
+* Tue Jan 24 2012 Nicolas Chauvet <kwizart at gmail.com> - 3.1-3.5
+- rebuild for updated kernel
+
+* Sun Jan 15 2012 Nicolas Chauvet <kwizart at gmail.com> - 3.1-3.4
+- rebuild for updated kernel
+
+* Mon Jan 09 2012 Nicolas Chauvet <kwizart at gmail.com> - 3.1-3.3
+- rebuild for updated kernel
+
+* Wed Jan 04 2012 Nicolas Chauvet <kwizart at gmail.com> - 3.1-3.2
+- rebuild for updated kernel
+
+* Tue Dec 27 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.1-3.1
+- disable SBE_2T3E3, leads to missing symbols (#2107)
+
+* Fri Dec 23 2011 Nicolas Chauvet <kwizart at gmail.com> - 3.1-2.9
+- rebuild for updated kernel
+
+* Sat Dec 17 2011 Nicolas Chauvet <kwizart at gmail.com> - 3.1-2.8
+- rebuild for updated kernel
+
+* Tue Dec 13 2011 Nicolas Chauvet <kwizart at gmail.com> - 3.1-2.7
+- rebuild for updated kernel
+
+* Sat Dec 10 2011 Nicolas Chauvet <kwizart at gmail.com> - 3.1-2.6
+- rebuild for updated kernel
+
+* Thu Dec 01 2011 Nicolas Chauvet <kwizart at gmail.com> - 3.1-2.5
+- rebuild for updated kernel
+
+* Wed Nov 23 2011 Nicolas Chauvet <kwizart at gmail.com> - 3.1-2.4
+- rebuild for updated kernel
+
+* Wed Nov 16 2011 Nicolas Chauvet <kwizart at gmail.com> - 3.1-2.3
+- rebuild for updated kernel
+
+* Mon Nov 14 2011 Nicolas Chauvet <kwizart at gmail.com> - 3.1-2.2
+- 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