SPECS (LINUX_2_6): kernel.spec - merge from LINUX_2_6_22 branch: -...

Sat Jan 19 18:31:01 CET 2008

Author: glen                         Date: Sat Jan 19 17:31:01 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- merge from LINUX_2_6_22 branch:
- drop dozen of provides, leave only internal deps
- besides by pld policy shouldn't depend on kernel package(s)
- drop now unused/pointless macros
- only netfilter deps left due iptables.spec
- no manual removal of /lib/modules/../modules.* needed, %ghost does that
- netfilter provide with alt kernel support
- droped -net-rndis subpackage
- no chrpath for sources
- reiser4 conflicts conditional

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1816 -> 1.441.2.1817) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1816 SPECS/kernel.spec:1.441.2.1817

--- SPECS/kernel.spec:1.441.2.1816	Fri Jan 18 17:57:57 2008
+++ SPECS/kernel.spec	Sat Jan 19 18:30:55 2008
@@ -123,14 +123,12 @@
 %define		_rel			0.1
 %define		subname			%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
 
-%define		_netfilter_snap		20070806
-%define		_nf_hipac_ver		0.9.1
+%define		netfilter_snap		20070806
 
 %define		_enable_debug_packages			0
 %define		no_install_post_strip			1
 %define		no_install_post_chrpath			1
 
-%define		pcmcia_version		3.1.22
 %define		drm_xfree_version	4.3.0
 
 %define		squashfs_version	3.2
@@ -311,7 +309,7 @@
 Patch102:	linux-2.6-vs2.2.patch
 # note about vserver 2.2 vs 2.3: 2.2 is "stable", 2.3 is "development", currently (2007-09-03)
 # the preferred 2.3 vserver needs CONFIG_IPV6=y config, which break things for some users;
-# it was proposed to use 2.2 as a temp replacement. One couuld use vs 2.2 instead of 2.3
+# it was proposed to use 2.2 as a temp replacement. One could use vs 2.2 instead of 2.3
 # by using vs22 bcond - this bcond also changes IPV6 option from "y" to "m".
 
 # from http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-3.0.2-src.tgz
@@ -372,8 +370,8 @@
 %ifarch sparc sparc64
 BuildRequires:	elftoaout
 %endif
+BuildRequires:	/sbin/depmod
 BuildRequires:	gcc >= 5:3.2
-BuildRequires:	module-init-tools
 # for hostname command
 BuildRequires:	net-tools
 BuildRequires:	perl-base
@@ -387,19 +385,10 @@
 Requires:	coreutils
 Requires:	geninitrd >= 2.57
 Requires:	module-init-tools >= 0.9.9
-Provides:	kernel(netfilter) = %{_netfilter_snap}
-Provides:	kernel(nf-hipac) = %{_nf_hipac_ver}
-Provides:	kernel(realtime-lsm) = 0.1.1
+Provides:	%{name}(netfilter) = %{netfilter_snap}
 %if %{with xen0} || %{with xenU}
 Provides:	kernel(xen) = %{_xen_version}
 %endif
-Provides:	kernel-misc-fuse
-Provides:	kernel-net-hostap = 0.4.4
-Provides:	kernel-net-ieee80211
-Provides:	kernel-net-ipp2p = 1:0.8.0
-Provides:	kernel-net-ipw2100 = 1.1.3
-Provides:	kernel-net-ipw2200 = 1.0.8
-Provides:	module-info
 Obsoletes:	kernel-smp
 Obsoletes:	kernel-misc-fuse
 Obsoletes:	kernel-modules
@@ -415,7 +404,9 @@
 Conflicts:	ppp < %{_ppp_ver}
 Conflicts:	procps < %{_procps_ver}
 Conflicts:	quota-tools < %{_quota_tools_ver}
+%if %{with reiserfs4}
 Conflicts:	reiser4progs < %{_reiser4progs_ver}
+%endif
 Conflicts:	reiserfsprogs < %{_reiserfsprogs_ver}
 Conflicts:	udev < %{_udev_ver}
 Conflicts:	util-linux < %{_util_linux_ver}
@@ -437,6 +428,7 @@
 
 # No ELF objects there to strip (skips processing 27k files)
 %define		_noautostrip	.*%{_kernelsrcdir}/.*
+%define		_noautochrpath	.*%{_kernelsrcdir}/.*
 
 %ifarch ia64
 %define		initrd_dir	/boot/efi
@@ -484,7 +476,7 @@
 your system. It contains few device drivers for specific hardware.
 Most hardware is instead supported by modules loaded after booting.
 
-Netfilter module dated: %{_netfilter_snap}
+Netfilter module dated: %{netfilter_snap}
 %{?with_abi:Linux ABI support - enabled}
 %{?with_grsec_full:Grsecurity full support - enabled}
 %{?with_pax:PaX support - enabled}
@@ -500,7 +492,7 @@
 Systemfunktionen verantwortlich: Speicherreservierung,
 ProzeĂŸ-Management, GerĂ¤te Ein- und Ausgaben, usw.
 
-Netfilter module dated: %{_netfilter_snap}
+Netfilter module dated: %{netfilter_snap}
 %{?with_abi:Linux ABI support - enabled}
 %{?with_grsec_full:Grsecurity full support - enabled}
 %{?with_pax:PaX support - enabled}
@@ -516,7 +508,7 @@
 fonctions basiques d'un systĂ¨me d'exploitation: allocation mĂŠmoire,
 allocation de process, entrĂŠe/sortie de peripheriques, etc.
 
-Netfilter module dated: %{_netfilter_snap}
+Netfilter module dated: %{netfilter_snap}
 %{?with_abi:Linux ABI support - enabled}
 %{?with_grsec_full:Grsecurity full support - enabled}
 %{?with_pax:PaX support - enabled}
@@ -531,7 +523,7 @@
 Twojego komputera. Zawiera w sobie sterowniki do sprzÄ™tu znajdujÄ
cego
 siÄ™ w komputerze, takiego jak sterowniki dyskĂłw itp.
 
-Netfilter module dated: %{_netfilter_snap}
+Netfilter module dated: %{netfilter_snap}
 %{?with_abi:Linux ABI support - enabled}
 %{?with_grsec_full:Grsecurity full support - enabled}
 %{?with_pax:PaX support - enabled}
@@ -559,7 +551,6 @@
 Group:		Base/Kernel
 Requires(postun):	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Provides:	kernel-drm = %{drm_xfree_version}
 Obsoletes:	kernel-smp-drm
 Autoreqprov:	no
 
@@ -575,18 +566,16 @@
 Group:		Base/Kernel
 Requires(postun):	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Provides:	kernel(pcmcia)
-Provides:	kernel-pcmcia = %{pcmcia_version}
 Obsoletes:	kernel-smp-pcmcia
 Conflicts:	pcmcia-cs < %{_pcmcia_cs_ver}
 Conflicts:	pcmciautils < %{_pcmciautils_ver}
 Autoreqprov:	no
 
 %description pcmcia
-PCMCIA modules (%{pcmcia_version}).
+PCMCIA modules.
 
 %description pcmcia -l pl.UTF-8
-ModuĹ‚y PCMCIA (%{pcmcia_version}).
+ModuĹ‚y PCMCIA.
 
 %package libs
 Summary:	Libraries for preparing bootable kernel on PowerPCs
@@ -639,12 +628,7 @@
 Summary:	Header files for the Linux kernel
 Summary(pl.UTF-8):	Pliki nagĹ‚Ăłwkowe jÄ
dra Linuksa
 Group:		Development/Building
-Provides:	kernel-headers = %{epoch}:%{version}-%{release}
-Provides:	kernel-headers(agpgart) = %{version}
-Provides:	kernel-headers(alsa-drivers)
-Provides:	kernel-headers(bridging) = %{version}
-Provides:	kernel-headers(netfilter) = %{_netfilter_snap}
-Provides:	kernel-headers(reiserfs) = %{version}
+Provides:	%{name}-headers(netfilter) = %{netfilter_snap}
 Autoreqprov:	no
 
 %description headers
@@ -661,8 +645,6 @@
 Summary(pl.UTF-8):	Pliki sĹ‚uĹźÄ
ce do budowania moduĹ‚Ăłw jÄ
dra
 Group:		Development/Building
 Requires:	%{name}-headers = %{epoch}:%{version}-%{release}
-Provides:	kernel-module-build = %{epoch}:%{_basever}
-Provides:	kernel-module-build = %{epoch}:%{version}-%{release}
 Conflicts:	rpmbuild(macros) < 1.321
 Autoreqprov:	no
 
@@ -679,14 +661,11 @@
 Summary(pl.UTF-8):	Kod ĹşrĂłdĹ‚owy jÄ
dra Linuksa
 Group:		Development/Building
 Requires:	%{name}-module-build = %{epoch}:%{version}-%{release}
-Provides:	kernel-source = %{epoch}:%{version}-%{release}
 Autoreqprov:	no
 
 %description source
-This is the source code for the Linux kernel. It is required to build
-most C programs as they depend on constants defined in here. You can
-also build a custom kernel that is better tuned to your particular
-hardware.
+This is the source code for the Linux kernel. You can build a custom
+kernel that is better tuned to your particular hardware.
 
 %description source -l de.UTF-8
 Das Kernel-Source-Paket enthĂ¤lt den source code (C/Assembler-Code) des
@@ -711,7 +690,6 @@
 Summary:	Kernel documentation
 Summary(pl.UTF-8):	Dokumentacja do jÄ
dra Linuksa
 Group:		Documentation
-Provides:	kernel-doc = %{version}
 Autoreqprov:	no
 
 %description doc
@@ -722,21 +700,6 @@
 Pakiet zawiera dokumentacjÄ™ do jÄ
dra Linuksa pochodzÄ
cÄ
 z katalogu
 /usr/src/linux/Documentation.
 
-%package net-rndis
-Summary:	cdc_ether, rndis_host and usbnet drivers
-Group:		Base/Kernel
-Requires(postun):	%{name} = %{epoch}:%{version}-%{release}
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Provides:	kernel-net-rndis = %{epoch}:%{version}-%{release}
-Obsoletes:	kernel-smp-net-rndis
-Obsoletes:	kernel-misc-usb-rndis-lite
-Autoreqprov:	no
-
-%description net-rndis
-Provides cdc_ether, rndis_host and usbnet device driver kernel
-modules. You could consider replacing this package with
-kernel-misc-usb-rndis-lite.
-
 %prep
 %setup -q -n linux-%{_basever}%{_rc} %{?with_abi:-a14}
 
@@ -997,7 +960,7 @@
 sed -i -e 's/^EXTRA_CFLAGS := -Werror/EXTRA_CFLAGS := /' arch/sparc64/kernel/Makefile
 
 # cleanup backups after patching
-find . '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -f
+find '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -f
 
 %build
 TuneUpConfigForIX86 () {
@@ -1380,7 +1343,6 @@
 rm -rf $RPM_BUILD_ROOT
 
 %preun
-rm -f /lib/modules/%{kernel_release}/modules.*
 if [ -x /sbin/new-kernel-pkg ]; then
 	/sbin/new-kernel-pkg --remove %{kernel_release}
 fi
@@ -1451,14 +1413,7 @@
 %postun sound-oss
 %depmod %{kernel_release}
 
-%post net-rndis
-%depmod %{kernel_release}
-
-%postun net-rndis
-%depmod %{kernel_release}
-
 %post headers
-rm -f %{_prefix}/src/linux%{subname}
 ln -snf %{basename:%{_kernelsrcdir}} %{_prefix}/src/linux%{subname}
 
 %postun headers
@@ -1517,11 +1472,6 @@
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/telephony/ixj_pcmcia.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/host/sl811_cs.ko*
 %endif
-%ifnarch sparc
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/usb/cdc_ether.ko*
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/usb/rndis_host.ko*
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/usb/usbnet.ko*
-%endif
 %ghost /lib/modules/%{kernel_release}/modules.*
 %dir %{_sysconfdir}/modprobe.d/%{kernel_release}
 
@@ -1553,14 +1503,6 @@
 /lib/modules/%{kernel_release}/kernel/drivers/usb/host/sl811_cs.ko*
 %endif
 
-%ifnarch sparc
-%files net-rndis
-%defattr(644,root,root,755)
-/lib/modules/%{kernel_release}/kernel/drivers/net/usb/cdc_ether.ko*
-/lib/modules/%{kernel_release}/kernel/drivers/net/usb/rndis_host.ko*
-/lib/modules/%{kernel_release}/kernel/drivers/net/usb/usbnet.ko*
-%endif
-
 %ifarch ppc-broken
 %if "%{_arch}" == "ppc"
 %files libs
@@ -1677,6 +1619,18 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1817  2008-01-19 17:30:55  glen
+- merge from LINUX_2_6_22 branch:
+- drop dozen of provides, leave only internal deps
+- besides by pld policy shouldn't depend on kernel package(s)
+- drop now unused/pointless macros
+- only netfilter deps left due iptables.spec
+- no manual removal of /lib/modules/../modules.* needed, %ghost does that
+- netfilter provide with alt kernel support
+- droped -net-rndis subpackage
+- no chrpath for sources
+- reiser4 conflicts conditional
+
 Revision 1.441.2.1816  2008-01-18 16:57:57  arekm
 - there is now only single arch dir for x86 and x86_64; fix updating configs for these arches
 
================================================================

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

