SPECS (LINUX_2_6): kernel.spec - rel 2; fix pcmcia split (no duplication of...

[arekm]

Author: arekm                        Date: Mon Jun 23 20:11:23 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- rel 2; fix pcmcia split (no duplication of files; move b1pcmcia to pcmcia subpkg)

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1925 -> 1.441.2.1926) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1925 SPECS/kernel.spec:1.441.2.1926
--- SPECS/kernel.spec:1.441.2.1925	Mon Jun 23 22:05:42 2008
+++ SPECS/kernel.spec	Mon Jun 23 22:11:16 2008
@@ -110,7 +110,7 @@
 %define		_prepatch		%{nil}
 %define		_pre_rc			%{nil}
 %define		_rc			%{nil}
-%define		_rel			1
+%define		_rel			2
 
 %define		_enable_debug_packages			0
 
@@ -1520,8 +1520,6 @@
 %endif
 %dir /lib/modules/%{kernel_release}/misc
 %if %{with pcmcia} && %{without myown}
-%dir /lib/modules/%{kernel_release}/kernel/drivers/pcmcia
-/lib/modules/%{kernel_release}/kernel/drivers/pcmcia/pcmcia*ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/pcmcia/[!p]*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/pcmcia/pd6729.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/*/pcmcia
@@ -1529,6 +1527,7 @@
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/ata/pata_pcmcia.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/bluetooth/*_cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/isdn/hardware/avm/avm_cs.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/isdn/hardware/avm/b1pcmcia.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/telephony/ixj_pcmcia.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/gadget/g_midi.ko*
 %endif
@@ -1568,6 +1567,7 @@
 %if %{without rescuecd}
 /lib/modules/%{kernel_release}/kernel/drivers/bluetooth/*_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/isdn/hardware/avm/avm_cs.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/isdn/hardware/avm/b1pcmcia.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/telephony/ixj_pcmcia.ko*
 %endif
 /lib/modules/%{kernel_release}/kernel/drivers/ata/pata_pcmcia.ko*
@@ -1707,6 +1707,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1926  2008/06/23 20:11:16  arekm
+- rel 2; fix pcmcia split (no duplication of files; move b1pcmcia to pcmcia subpkg)
+
 Revision 1.441.2.1925  2008/06/23 20:05:42  arekm
 - uboot-mkimage neede on ppc build (arch/powerpc/boot/wrapper uses it)
 
================================================================

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