SPECS (LINUX_2_6_24): kernel-desktop.spec - moved pcmcia.ko to main package...

[hawk]

Author: hawk                         Date: Mon Jun  9 17:00:42 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_24
---- Log message:
- moved pcmcia.ko to main package to satisfy ssb.ko deps

---- Files affected:
SPECS:
   kernel-desktop.spec (1.196.2.13 -> 1.196.2.14) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.196.2.13 SPECS/kernel-desktop.spec:1.196.2.14
--- SPECS/kernel-desktop.spec:1.196.2.13	Sun Jun  8 15:12:58 2008
+++ SPECS/kernel-desktop.spec	Mon Jun  9 19:00:37 2008
@@ -1050,7 +1050,10 @@
 /lib/modules/%{kernel_release}/kernel/sound/soundcore.*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/media/video/*/*-alsa.ko*
 %dir /lib/modules/%{kernel_release}/misc
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/pcmcia
+%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
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/bluetooth/*_cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/ide/legacy/ide-cs.ko*
@@ -1078,8 +1081,9 @@
 
 %files pcmcia
 %defattr(644,root,root,755)
-/lib/modules/%{kernel_release}/kernel/drivers/pcmcia
+/lib/modules/%{kernel_release}/kernel/drivers/pcmcia/*ko*
 /lib/modules/%{kernel_release}/kernel/drivers/*/pcmcia
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/pcmcia/pcmcia*ko*
 /lib/modules/%{kernel_release}/kernel/drivers/bluetooth/*_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/ide/legacy/ide-cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/isdn/hardware/avm/avm_cs.ko*
@@ -1195,6 +1199,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.196.2.14  2008-06-09 17:00:37  hawk
+- moved pcmcia.ko to main package to satisfy ssb.ko deps
+
 Revision 1.196.2.13  2008-06-08 13:12:58  hawk
 - disabled noarch separation for PLD Titanium
 
================================================================

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