SPECS (LINUX_2_6): kernel.spec - symbol consistency between packages completed

[zbyniu]

Author: zbyniu                       Date: Sat May 24 10:17:26 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- symbol consistency between packages completed

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1911 -> 1.441.2.1912) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1911 SPECS/kernel.spec:1.441.2.1912
--- SPECS/kernel.spec:1.441.2.1911	Sat May 24 00:03:46 2008
+++ SPECS/kernel.spec	Sat May 24 12:17:18 2008
@@ -1479,13 +1479,18 @@
 /lib/modules/%{kernel_release}/kernel/net
 %if %{have_sound}
 %dir /lib/modules/%{kernel_release}/kernel/sound
-/lib/modules/%{kernel_release}/kernel/sound/soundcore.*
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/media/video/saa7134/saa7134-alsa.ko*
+/lib/modules/%{kernel_release}/kernel/sound/ac97_bus.ko*
+/lib/modules/%{kernel_release}/kernel/sound/sound*.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/media/video/cx88/cx88-alsa.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/media/video/em28xx/em28xx-alsa.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/media/video/saa7134/saa7134-alsa.ko*
 %endif
 %dir /lib/modules/%{kernel_release}/misc
 %if %{with pcmcia}
-%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
 %if %{without rescuecd}
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/ata/pata_pcmcia.ko*
@@ -1524,8 +1529,9 @@
 %if %{with pcmcia}
 %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*
 %if %{without rescuecd}
 /lib/modules/%{kernel_release}/kernel/drivers/bluetooth/*_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/isdn/hardware/avm/avm_cs.ko*
@@ -1564,13 +1570,15 @@
 %defattr(644,root,root,755)
 /lib/modules/%{kernel_release}/kernel/sound
 %exclude %dir /lib/modules/%{kernel_release}/kernel/sound
-%exclude /lib/modules/%{kernel_release}/kernel/sound/soundcore.*
+%exclude /lib/modules/%{kernel_release}/kernel/sound/ac97_bus.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/sound/sound*.ko*
 %if %{have_oss}
 %exclude /lib/modules/%{kernel_release}/kernel/sound/oss
 %endif
 /lib/modules/%{kernel_release}/kernel/drivers/usb/gadget/g_midi.ko*
-/lib/modules/%{kernel_release}/kernel/drivers/media/video/saa7134/saa7134-alsa.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/media/video/cx88/cx88-alsa.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/media/video/em28xx/em28xx-alsa.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/media/video/saa7134/saa7134-alsa.ko*
 
 %if %{have_oss}
 %files sound-oss
@@ -1664,6 +1672,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1912  2008-05-24 10:17:18  zbyniu
+- symbol consistency between packages completed
+
 Revision 1.441.2.1911  2008-05-23 22:03:46  zbyniu
 - vserver and pax (in grsec_full) updated; rel 2
 
================================================================

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