rpms/staging-kmod/F-15 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 staging-kmod.spec, 1.55, 1.56

Thorsten Leemhuis thl at rpmfusion.org
Wed Apr 4 18:20:45 CEST 2012


Author: thl

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

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/F-15/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Feb 2012 09:11:58 -0000	1.7
+++ .cvsignore	4 Apr 2012 16:20:15 -0000	1.8
@@ -1 +1 @@
-linux-staging-3.2.1.tar.bz2
+linux-staging-3.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-15/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Feb 2012 09:11:58 -0000	1.7
+++ sources	4 Apr 2012 16:20:15 -0000	1.8
@@ -1 +1 @@
-59dff60d685e84fa61e6f37c9f7047e8  linux-staging-3.2.1.tar.bz2
+7080bd32b25b30a6c57694d846e6cecc  linux-staging-3.3.tar.bz2


Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-15/staging-kmod.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- staging-kmod.spec	3 Apr 2012 17:29:04 -0000	1.55
+++ staging-kmod.spec	4 Apr 2012 16:20:15 -0000	1.56
@@ -1,7 +1,7 @@
 # akmods not supported
 
 # which drivers to built
-%global stgdrvs ASUS_OLED BCM_WIMAX 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 RTS5139 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.2.1
-Release:       %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.10
+Version:       3.3
+Release:       %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.3
 Summary:       Selected kernel modules from linux-staging
 
 Group:         System Environment/Kernel
@@ -69,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
@@ -131,32 +127,15 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Tue Apr 03 2012 Nicolas Chauvet <kwizart at gmail.com> - 3.2.1-1.10
-- rebuild for updated kernel
-
-* Wed Mar 21 2012 Nicolas Chauvet <kwizart at gmail.com> - 3.2.1-1.9
-- rebuild for updated kernel
-
-* Wed Mar 21 2012 Nicolas Chauvet <kwizart at gmail.com> - 3.2.1-1.8
-- rebuild for updated kernel
-
-* Sun Mar 18 2012 Nicolas Chauvet <kwizart at gmail.com> - 3.2.1-1.7
+* Tue Apr 03 2012 Nicolas Chauvet <kwizart at gmail.com> - 3.3-1.3
 - rebuild for updated kernel
 
-* Thu Mar 08 2012 Nicolas Chauvet <kwizart at gmail.com> - 3.2.1-1.6
+* Fri Mar 30 2012 Nicolas Chauvet <kwizart at gmail.com> - 3.3-1.2
 - rebuild for updated kernel
 
-* Sat Mar 03 2012 Nicolas Chauvet <kwizart at gmail.com> - 3.2.1-1.5
-- rebuild for updated kernel
-
-* Thu Mar 01 2012 Nicolas Chauvet <kwizart at gmail.com> - 3.2.1-1.4
-- rebuild for updated kernel
-
-* Wed Feb 22 2012 Nicolas Chauvet <kwizart at gmail.com> - 3.2.1-1.3
-- rebuild for updated kernel
-
-* Wed Feb 15 2012 Nicolas Chauvet <kwizart at gmail.com> - 3.2.1-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


More information about the rpmfusion-commits mailing list