packages (LINUX_2_6_35): kernel/kernel.spec - revert wanrouter split (use -...

[glen]

Author: glen                         Date: Tue Mar  1 13:55:21 2011 GMT
Module: packages                      Tag: LINUX_2_6_35
---- Log message:
- revert wanrouter split (use -s for %install_kernel_modules to rename addon modules, like e1000.spec, bnx2.spec)

---- Files affected:
packages/kernel:
   kernel.spec (1.837.2.6 -> 1.837.2.7) 

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.837.2.6 packages/kernel/kernel.spec:1.837.2.7
--- packages/kernel/kernel.spec:1.837.2.6	Sat Feb 26 21:58:06 2011
+++ packages/kernel/kernel.spec	Tue Mar  1 14:55:16 2011
@@ -689,20 +689,6 @@
 Pakiet zawiera dokumentację do jądra Linuksa pochodzącą z katalogu
 /usr/src/linux/Documentation.
 
-%package wanrouter
-Summary:	WAN Multiprotocol Router Module
-Summary(pl.UTF-8):	WAN Multiprotocol Router Module
-Group:		Base/Kernel
-Requires(postun):       %{name} = %{epoch}:%{version}-%{release}
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-AutoReqProv:	no
-
-%description wanrouter
-WAN Multiprotocol Router Module.
-
-%description wanrouter -l pl.UTF-8
-WAN Multiprotocol Router Module.
-
 %prep
 %setup -qc
 ln -s %{SOURCE7} kernel-module-build.pl
@@ -1301,9 +1287,6 @@
 %postun sound-oss
 %depmod %{kernel_release}
 
-%postun wanrouter
-%depmod %{kernel_release}
-
 %post headers
 ln -snf %{basename:%{_kernelsrcdir}} %{_prefix}/src/linux%{_alt_kernel}
 
@@ -1351,9 +1334,6 @@
 /lib/modules/%{kernel_release}/kernel/lib
 /lib/modules/%{kernel_release}/kernel/net
 /lib/modules/%{kernel_release}/kernel/mm
-
-%exclude /lib/modules/%{kernel_release}/kernel/net/wanrouter/wanrouter.ko*
-
 %if %{have_sound}
 %dir /lib/modules/%{kernel_release}/kernel/sound
 /lib/modules/%{kernel_release}/kernel/sound/ac97_bus.ko*
@@ -1537,10 +1517,6 @@
 %lang(zh_CN) %{_docdir}/%{name}-%{version}/zh_CN
 %endif
 
-%files wanrouter
-%defattr(644,root,root,755)
-/lib/modules/%{kernel_release}/kernel/net/wanrouter/wanrouter.ko*
-
 %if %{with source}
 %files source -f files.source_exclude_modulebuild_and_dirs
 %defattr(644,root,root,755)
@@ -1617,6 +1593,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.7  2011/03/01 13:55:16  glen
+- revert wanrouter split (use -s for %install_kernel_modules to rename addon modules, like e1000.spec, bnx2.spec)
+
 Revision 1.837.2.6  2011/02/26 20:58:06  areq
 - separate package wanrouter - to avoid conflict with wanrouter.ko from
   wanpipe.spec
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.837.2.6&r2=1.837.2.7&f=u