SPECS: kernel-desktop.spec - netfilter back in main package - othe...

sparky sparky at pld-linux.org
Sun Sep 3 15:17:10 CEST 2006 

Author: sparky                       Date: Sun Sep  3 13:17:10 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- netfilter back in main package
- other way of fixing smp 'name vs dir'
- move miropcm20-rds.ko to sound-oss
- sound/pcmcia moved to pcmcia package (now there are missing symbols in
  pcmcia subpackage if sound-alsa is not installed)
- moved saa7134-alsa.ko and cx88-alsa.ko to sound-alsa

---- Files affected:
SPECS:
   kernel-desktop.spec (1.58 -> 1.59) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.58 SPECS/kernel-desktop.spec:1.59
--- SPECS/kernel-desktop.spec:1.58	Sat Sep  2 23:29:22 2006
+++ SPECS/kernel-desktop.spec	Sun Sep  3 15:17:05 2006
@@ -281,26 +281,6 @@
 %description drm -l pl
 Sterowniki DRM (%{drm_xfree_version}).
 
-%package net-netfilter
-Summary:	Netfilter kernel modules
-Summary(de):	Netfilter Kernel Treiber
-Summary(pl):	Moduły Netfiltera
-Group:		Base/Kernel
-Requires(postun):	%{name}-up = %{epoch}:%{version}-%{release}
-Requires:	%{name}-up = %{epoch}:%{version}-%{release}
-Provides:	kernel(netfilter) = %{_netfilter_snap}
-Provides:	kernel(nf-hipac) = %{_nf_hipac_ver}
-Autoreqprov:	no
-
-%description net-netfilter
-Netfilter kernel modules (%{_netfilter_snap}).
-
-%description net-netfilter -l de
-Netfilter Kernel Treiber (%{_netfilter_snap}).
-
-%description net-netfilter -l pl
-Moduły Netfiltera (%{_netfilter_snap}).
-
 %package pcmcia
 Summary:	PCMCIA modules
 Summary(de):	PCMCIA Module
@@ -447,26 +427,6 @@
 %description smp-drm -l pl
 Sterowniki DRM dla maszyn wieloprocesorowych (%{drm_xfree_version}).
 
-%package smp-net-netfilter
-Summary:	Netfilter SMP kernel modules
-Summary(de):	Netfilter SMP Kernel Treiber
-Summary(pl):	Moduły Netfiltera dla maszyn wieloprocesorowych
-Group:		Base/Kernel
-Requires(postun):	%{name}-up = %{epoch}:%{version}-%{release}
-Requires:	%{name}-smp = %{epoch}:%{version}-%{release}
-Provides:	kernel(netfilter) = %{_netfilter_snap}
-Provides:	kernel(nf-hipac) = %{_nf_hipac_ver}
-Autoreqprov:	no
-
-%description smp-net-netfilter
-Netfilter SMP kernel modules (%{_netfilter_snap}).
-
-%description smp-net-netfilter -l de
-Netfilter SMP Kernel Treiber (%{_netfilter_snap}).
-
-%description smp-net-netfilter -l pl
-Moduły Netfiltera dla maszyn wieloprocesorowych (%{_netfilter_snap}).
-
 %package smp-pcmcia
 Summary:	PCMCIA modules for SMP kernel
 Summary(de):	PCMCIA Module für SMP Kernel
@@ -791,13 +751,16 @@
 	[ "$1" = "smp" -o "$2" = "smp" ] && smp="yes"
 	if [ "$smp" = "yes" ]; then
 		cfg="smp"
+		echo "-%{release}smp" > localversion
 		Config="%{_target_base_arch}-smp"
 	else
+		echo "-%{release}" > localversion
 		Config="%{_target_base_arch}"
 	fi
 	KernelVer=%{ver_rel}$1
 
 	echo "Building config file [using $Config.conf] for KERNEL $1..."
+
 	cat %{SOURCE20} > arch/%{_target_base_arch}/defconfig
 	cat $RPM_SOURCE_DIR/kernel-desktop-$Config.config >> arch/%{_target_base_arch}/defconfig
 
@@ -839,11 +802,6 @@
 %{?debug:sed -i "s:# CONFIG_DEBUG_PREEMPT is not set:CONFIG_DEBUG_PREEMPT=y:" arch/%{_target_base_arch}/defconfig}
 %{?debug:sed -i "s:# CONFIG_RT_DEADLOCK_DETECT is not set:CONFIG_RT_DEADLOCK_DETECT=y:" arch/%{_target_base_arch}/defconfig}
 
-	if [ "$smp" = "yes" ]; then
-		sed -e 's:CONFIG_LOCALVERSION="":CONFIG_LOCALVERSION="smp":'	\
-			-i arch/%{_target_base_arch}/defconfig
-	fi
-
 	ln -sf arch/%{_target_base_arch}/defconfig .config
 	install -d $KERNEL_INSTALL_DIR/usr/src/linux-%{ver}/include/linux
 	rm -f include/linux/autoconf.h
@@ -915,7 +873,6 @@
 }
 
 KERNEL_BUILD_DIR=`pwd`
-echo "-%{release}" > localversion
 
 # UP KERNEL
 KERNEL_INSTALL_DIR="$KERNEL_BUILD_DIR/build-done/kernel-UP"
@@ -1178,17 +1135,16 @@
 /lib/modules/%{ver_rel}/kernel/drivers
 %exclude /lib/modules/%{ver_rel}/kernel/drivers/char/drm
 %if %{have_isa}
-%exclude /lib/modules/%{ver_rel}/kernel/drivers/media/radio/miropcm20.ko*
+%exclude /lib/modules/%{ver_rel}/kernel/drivers/media/radio/miropcm20*.ko*
 %endif
 /lib/modules/%{ver_rel}/kernel/fs
 /lib/modules/%{ver_rel}/kernel/kernel
 /lib/modules/%{ver_rel}/kernel/lib
 /lib/modules/%{ver_rel}/kernel/net
-%exclude /lib/modules/%{ver_rel}/kernel/net/netfilter
-%exclude /lib/modules/%{ver_rel}/kernel/net/*/netfilter
 /lib/modules/%{ver_rel}/kernel/security
 %dir /lib/modules/%{ver_rel}/kernel/sound
 /lib/modules/%{ver_rel}/kernel/sound/soundcore.*
+%exclude /lib/modules/%{ver_rel}/kernel/drivers/media/video/*/*-alsa.ko*
 %dir /lib/modules/%{ver_rel}/misc
 %exclude /lib/modules/%{ver_rel}/kernel/drivers/pcmcia
 %exclude /lib/modules/%{ver_rel}/kernel/drivers/*/pcmcia
@@ -1213,11 +1169,6 @@
 %defattr(644,root,root,755)
 /lib/modules/%{ver_rel}/kernel/drivers/char/drm
 
-%files net-netfilter
-%defattr(644,root,root,755)
-/lib/modules/%{ver_rel}/kernel/net/netfilter
-/lib/modules/%{ver_rel}/kernel/net/*/netfilter
-
 %files pcmcia
 %defattr(644,root,root,755)
 /lib/modules/%{ver_rel}/kernel/drivers/pcmcia
@@ -1231,19 +1182,22 @@
 /lib/modules/%{ver_rel}/kernel/drivers/serial/serial_cs.ko*
 /lib/modules/%{ver_rel}/kernel/drivers/telephony/ixj_pcmcia.ko*
 /lib/modules/%{ver_rel}/kernel/drivers/usb/host/sl811_cs.ko*
+/lib/modules/%{ver_rel}/kernel/sound/pcmcia
 
 %files sound-alsa
 %defattr(644,root,root,755)
 /lib/modules/%{ver_rel}/kernel/sound
+/lib/modules/%{ver_rel}/kernel/drivers/media/video/*/*-alsa.ko*
 %exclude %dir /lib/modules/%{ver_rel}/kernel/sound
 %exclude /lib/modules/%{ver_rel}/kernel/sound/soundcore.*
 %exclude /lib/modules/%{ver_rel}/kernel/sound/oss
+%exclude /lib/modules/%{ver_rel}/kernel/sound/pcmcia
 
 %files sound-oss
 %defattr(644,root,root,755)
 /lib/modules/%{ver_rel}/kernel/sound/oss
 %if %{have_isa}
-/lib/modules/%{ver_rel}/kernel/drivers/media/radio/miropcm20.ko*
+/lib/modules/%{ver_rel}/kernel/drivers/media/radio/miropcm20*.ko*
 %endif
 %endif			# %%{with up}
 
@@ -1261,17 +1215,16 @@
 /lib/modules/%{ver_rel}smp/kernel/drivers
 %exclude /lib/modules/%{ver_rel}smp/kernel/drivers/char/drm
 %if %{have_isa}
-%exclude /lib/modules/%{ver_rel}smp/kernel/drivers/media/radio/miropcm20.ko*
+%exclude /lib/modules/%{ver_rel}smp/kernel/drivers/media/radio/miropcm20*.ko*
 %endif
 /lib/modules/%{ver_rel}smp/kernel/fs
 /lib/modules/%{ver_rel}smp/kernel/kernel
 /lib/modules/%{ver_rel}smp/kernel/lib
 /lib/modules/%{ver_rel}smp/kernel/net
-%exclude /lib/modules/%{ver_rel}smp/kernel/net/netfilter
-%exclude /lib/modules/%{ver_rel}smp/kernel/net/*/netfilter
 /lib/modules/%{ver_rel}smp/kernel/security
 %dir /lib/modules/%{ver_rel}smp/kernel/sound
 /lib/modules/%{ver_rel}smp/kernel/sound/soundcore.*
+%exclude /lib/modules/%{ver_rel}smp/kernel/drivers/media/video/*/*-alsa.ko*
 %dir /lib/modules/%{ver_rel}smp/misc
 %exclude /lib/modules/%{ver_rel}smp/kernel/drivers/pcmcia
 %exclude /lib/modules/%{ver_rel}smp/kernel/drivers/*/pcmcia
@@ -1296,11 +1249,6 @@
 %defattr(644,root,root,755)
 /lib/modules/%{ver_rel}smp/kernel/drivers/char/drm
 
-%files smp-net-netfilter
-%defattr(644,root,root,755)
-/lib/modules/%{ver_rel}smp/kernel/net/netfilter
-/lib/modules/%{ver_rel}smp/kernel/net/*/netfilter
-
 %files smp-pcmcia
 %defattr(644,root,root,755)
 /lib/modules/%{ver_rel}smp/kernel/drivers/pcmcia
@@ -1314,19 +1262,22 @@
 /lib/modules/%{ver_rel}smp/kernel/drivers/serial/serial_cs.ko*
 /lib/modules/%{ver_rel}smp/kernel/drivers/telephony/ixj_pcmcia.ko*
 /lib/modules/%{ver_rel}smp/kernel/drivers/usb/host/sl811_cs.ko*
+/lib/modules/%{ver_rel}smp/kernel/sound/pcmcia
 
 %files smp-sound-alsa
 %defattr(644,root,root,755)
 /lib/modules/%{ver_rel}smp/kernel/sound
+/lib/modules/%{ver_rel}smp/kernel/drivers/media/video/*/*-alsa.ko*
 %exclude %dir /lib/modules/%{ver_rel}smp/kernel/sound
 %exclude /lib/modules/%{ver_rel}smp/kernel/sound/soundcore.*
 %exclude /lib/modules/%{ver_rel}smp/kernel/sound/oss
+%exclude /lib/modules/%{ver_rel}smp/kernel/sound/pcmcia
 
 %files smp-sound-oss
 %defattr(644,root,root,755)
 /lib/modules/%{ver_rel}smp/kernel/sound/oss
 %if %{have_isa}
-/lib/modules/%{ver_rel}smp/kernel/drivers/media/radio/miropcm20.ko*
+/lib/modules/%{ver_rel}smp/kernel/drivers/media/radio/miropcm20*.ko*
 %endif
 %endif			# %%{with smp}
 
@@ -1409,6 +1360,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.59  2006/09/03 13:17:05  sparky
+- netfilter back in main package
+- other way of fixing smp 'name vs dir'
+- move miropcm20-rds.ko to sound-oss
+- sound/pcmcia moved to pcmcia package (now there are missing symbols in
+  pcmcia subpackage if sound-alsa is not installed)
+- moved saa7134-alsa.ko and cx88-alsa.ko to sound-alsa
+
 Revision 1.58  2006/09/02 21:29:22  paszczus
 - fixed SMP modules directory (big thx to pepe (at) apollo.pl)
 
================================================================

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

More information about the pld-cvs-commit mailing list