SPECS (LINUX_2_6_20): kernel.spec - rel 0.14 - move drivers/usb/ne...

[mguevara]

Author: mguevara                     Date: Thu Mar  8 00:59:11 2007 GMT
Module: SPECS                         Tag: LINUX_2_6_20
---- Log message:
- rel 0.14
- move drivers/usb/net/{cdc_ether,rndis_host,usbnet}.ko.* modules to 
  separate kernel-net-rndis and kernel-smp-net-rndis subpackages for 
  easy replacement by kernel-misc-usb-rndis-lite 

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1698.2.61 -> 1.441.2.1698.2.62) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1698.2.61 SPECS/kernel.spec:1.441.2.1698.2.62
--- SPECS/kernel.spec:1.441.2.1698.2.61	Wed Mar  7 10:50:35 2007
+++ SPECS/kernel.spec	Thu Mar  8 01:59:05 2007
@@ -33,6 +33,9 @@
 # - test external modules
 # - p200 linux-2.6-ppc-ICE-hacks.patch - untested - ppc needed
 # - mms-conntrack-nat - port to nf_conntrack and enable in kernel-netfilter.config
+# - move drivers/usb/net/{cdc_ether,rndis_host,usbnet}.ko.* modules to 
+#   separate kernel-net-rndis subpackage for easy replacement 
+#   by kernel-misc-usb-rndis-lite 
 #
 # FUTURE:
 # - separate PaX and grsecurity support - future
@@ -154,7 +157,7 @@
 %define		_prepatch		%{nil}
 %define		_pre_rc			%{nil}
 %define		_rc			%{nil}
-%define		_rel			0.13
+%define		_rel			0.14
 
 %define		_netfilter_snap		20061213
 %define		_nf_hipac_ver		0.9.1
@@ -941,6 +944,32 @@
 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}-up = %{epoch}:%{version}-%{release}
+Requires:	%{name}-up = %{epoch}:%{version}-%{release}
+Provides:	kernel-net-rndis = %{epoch}:%{version}-%{release}
+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.
+
+%package smp-net-rndis
+Summary:	cdc_ether, rndis_host and usbnet drivers
+Group:		Base/Kernel
+Requires(postun):	%{name}-smp = %{epoch}:%{version}-%{release}
+Requires:	%{name}-smp = %{epoch}:%{version}-%{release}
+Provides:	kernel-net-rndis = %{epoch}:%{version}-%{release}
+Obsoletes:	kernel-misc-usb-rndis-lite
+Autoreqprov:	no
+
+%description smp-net-rndis
+Provides cdc_ether, rndis_host and usbnet device driver kernel modules. You
+could consider replacing this package with kernel-smp-misc-usb-rndis-lite.
+
 %prep
 %setup -q -n linux-%{_basever}%{_rc} %{?with_abi:-a14}
 
@@ -1668,6 +1697,12 @@
 %postun sound-oss
 %depmod %{kernel_release}
 
+%post net-rndis
+%depmod %{kernel_release}
+
+%postun net-rndis
+%depmod %{kernel_release}
+
 %preun smp
 rm -f /lib/modules/%{kernel_release}smp/modules.*
 if [ -x /sbin/new-kernel-pkg ]; then
@@ -1740,6 +1775,12 @@
 %postun smp-sound-oss
 %depmod %{kernel_release}smp
 
+%post smp-net-rndis
+%depmod %{kernel_release}smp
+
+%postun smp-net-rndis
+%depmod %{kernel_release}smp
+
 %post headers
 rm -f %{_prefix}/src/linux
 ln -snf %{basename:%{_kernelsrcdir}} %{_prefix}/src/linux
@@ -1802,6 +1843,9 @@
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/telephony/ixj_pcmcia.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/host/sl811_cs.ko*
 %endif
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/net/cdc_ether.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/net/rndis_host.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/net/usbnet.ko*
 %ghost /lib/modules/%{kernel_release}/modules.*
 %dir %{_sysconfdir}/modprobe.d/%{kernel_release}
 
@@ -1914,6 +1958,9 @@
 %exclude /lib/modules/%{kernel_release}smp/kernel/drivers/telephony/ixj_pcmcia.ko*
 %exclude /lib/modules/%{kernel_release}smp/kernel/drivers/usb/host/sl811_cs.ko*
 %endif
+%exclude /lib/modules/%{kernel_release}smp/kernel/drivers/usb/net/cdc_ether.ko*
+%exclude /lib/modules/%{kernel_release}smp/kernel/drivers/usb/net/rndis_host.ko*
+%exclude /lib/modules/%{kernel_release}smp/kernel/drivers/usb/net/usbnet.ko*
 %ghost /lib/modules/%{kernel_release}smp/modules.*
 %dir %{_sysconfdir}/modprobe.d/%{kernel_release}smp
 
@@ -2019,6 +2066,18 @@
 %{_kernelsrcdir}/scripts/kconfig/*
 %{_kernelsrcdir}/scripts/mkcompile_h
 
+%files net-rndis
+%defattr(644,root,root,755)
+/lib/modules/%{kernel_release}/kernel/drivers/usb/net/cdc_ether.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/usb/net/rndis_host.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/usb/net/usbnet.ko*
+
+%files smp-net-rndis
+%defattr(644,root,root,755)
+/lib/modules/%{kernel_release}smp/kernel/drivers/usb/net/cdc_ether.ko*
+/lib/modules/%{kernel_release}smp/kernel/drivers/usb/net/rndis_host.ko*
+/lib/modules/%{kernel_release}smp/kernel/drivers/usb/net/usbnet.ko*
+
 %files doc
 %defattr(644,root,root,755)
 %{_kernelsrcdir}/Documentation
@@ -2072,6 +2131,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1698.2.62  2007/03/08 00:59:05  mguevara
+- rel 0.14
+- move drivers/usb/net/{cdc_ether,rndis_host,usbnet}.ko.* modules to
+  separate kernel-net-rndis and kernel-smp-net-rndis subpackages for
+  easy replacement by kernel-misc-usb-rndis-lite
+
 Revision 1.441.2.1698.2.61  2007/03/07 09:50:35  mguevara
 - pax-linux-2.6.20.patch updated to test6
 - some desc fixes
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1698.2.61&r2=1.441.2.1698.2.62&f=u