SPECS (LINUX_2_6_22): kernel.spec - rndis_host remerged to main pa...

[zbyniu]

Author: zbyniu                       Date: Wed Dec 12 22:11:21 2007 GMT
Module: SPECS                         Tag: LINUX_2_6_22
---- Log message:
- rndis_host remerged to main package
- kernel-rndis_host-wm5.patch added; rel 5

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1796.2.30 -> 1.441.2.1796.2.31) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1796.2.30 SPECS/kernel.spec:1.441.2.1796.2.31
--- SPECS/kernel.spec:1.441.2.1796.2.30	Wed Dec 12 13:17:30 2007
+++ SPECS/kernel.spec	Wed Dec 12 23:11:15 2007
@@ -118,7 +118,7 @@
 %define		_prepatch		%{nil}
 %define		_pre_rc			%{nil}
 %define		_rc			%{nil}
-%define		_rel			4
+%define		_rel			5
 %define		subname			%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
 
 %define		_netfilter_snap		20070806
@@ -295,6 +295,9 @@
 # http://www.ntop.org/PF_RING.html 20070610
 Patch58:	linux-PF_RING.patch
 
+# http://synce.svn.sourceforge.net/svnroot/synce/trunk/patches/linux-2.6.22-rndis_host-wm5.patch
+Patch59:	kernel-rndis_host-wm5.patch
+
 # Derived from http://www.skd.de/e_en/products/adapters/pci_64/sk-98xx_v20/software/linux/driver/install-8_41.tar.bz2
 Patch60:	linux-2.6-sk98lin_v10.0.4.3.patch
 
@@ -735,21 +738,6 @@
 Pakiet zawiera dokumentacjÄ™ do jÄ
dra Linuksa pochodzÄ
cÄ
 z katalogu
 /usr/src/linux/Documentation.
 
-%package net-rndis
-Summary:	cdc_ether, rndis_host and usbnet drivers
-Group:		Base/Kernel
-Requires(postun):	%{name} = %{epoch}:%{version}-%{release}
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Provides:	kernel-net-rndis = %{epoch}:%{version}-%{release}
-Obsoletes:	kernel-smp-net-rndis
-Obsoletes:	kernel-misc-usb-rndis-lite
-Autoreqprov:	no
-
-%description net-rndis
-Provides cdc_ether, rndis_host and usbnet device driver kernel
-modules. You could consider replacing this package with
-kernel-misc-usb-rndis-lite.
-
 %prep
 %setup -q -n linux-%{_basever}%{_rc} %{?with_abi:-a14}
 
@@ -900,8 +888,12 @@
 %patch57 -p1
 %endif
 
+# linux-PF_RING.patch
 %patch58 -p1
 
+# kernel-rndis_host-wm5.patch
+%patch59 -p1
+
 # linux-2.6-sk98lin_v10.0.4.3.patch
 %patch60 -p1
 
@@ -1486,12 +1478,6 @@
 %postun sound-oss
 %depmod %{kernel_release}
 
-%post net-rndis
-%depmod %{kernel_release}
-
-%postun net-rndis
-%depmod %{kernel_release}
-
 %post headers
 rm -f %{_prefix}/src/linux%{subname}
 ln -snf %{basename:%{_kernelsrcdir}} %{_prefix}/src/linux%{subname}
@@ -1554,11 +1540,6 @@
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/telephony/ixj_pcmcia.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/host/sl811_cs.ko*
 %endif
-%ifnarch sparc
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/usb/cdc_ether.ko*
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/usb/rndis_host.ko*
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/usb/usbnet.ko*
-%endif
 %ghost /lib/modules/%{kernel_release}/modules.*
 %dir %{_sysconfdir}/modprobe.d/%{kernel_release}
 
@@ -1590,14 +1571,6 @@
 /lib/modules/%{kernel_release}/kernel/drivers/usb/host/sl811_cs.ko*
 %endif
 
-%ifnarch sparc
-%files net-rndis
-%defattr(644,root,root,755)
-/lib/modules/%{kernel_release}/kernel/drivers/net/usb/cdc_ether.ko*
-/lib/modules/%{kernel_release}/kernel/drivers/net/usb/rndis_host.ko*
-/lib/modules/%{kernel_release}/kernel/drivers/net/usb/usbnet.ko*
-%endif
-
 %ifarch ppc-broken
 %if "%{_arch}" == "ppc"
 %files libs
@@ -1715,6 +1688,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1796.2.31  2007-12-12 22:11:15  zbyniu
+- rndis_host remerged to main package
+- kernel-rndis_host-wm5.patch added; rel 5
+
 Revision 1.441.2.1796.2.30  2007-12-12 12:17:30  zbyniu
 - patch for support conntrack in ipvs
 - grsec fixes
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1796.2.30&r2=1.441.2.1796.2.31&f=u