SPECS (LINUX_2_6_22): kernel.spec - LINUX_2_6_16 merge: - drop doz...

glen Wed, 23 Jan 2008 04:56:22 -0800

Author: glen                         Date: Sat Jan 19 17:05:30 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_22
---- Log message:
- LINUX_2_6_16 merge:
- 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


---- Files affected:
SPECS:
   kernel.spec (1.441.2.1796.2.41 -> 1.441.2.1796.2.42) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1796.2.41 SPECS/kernel.spec:1.441.2.1796.2.42
--- SPECS/kernel.spec:1.441.2.1796.2.41 Fri Jan 18 14:48:12 2008
+++ SPECS/kernel.spec   Sat Jan 19 18:05:24 2008
@@ -127,14 +127,12 @@
 %define                _rel                    4
 %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
@@ -424,8 +422,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
@@ -437,19 +435,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:      kernel%{subname}(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
@@ -465,7 +454,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}
@@ -528,7 +519,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}
@@ -544,7 +535,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}
@@ -560,7 +551,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}
@@ -575,7 +566,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}
@@ -603,7 +594,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
 
@@ -619,18 +609,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
@@ -683,11 +671,7 @@
 Summary:       Header files for the Linux kernel
 Summary(pl.UTF-8):     Pliki nagĹĂłwkowe jÄdra Linuksa
 Group:         Development/Building
-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:      kernel%{subname}-headers(netfilter) = %{netfilter_snap}
 Autoreqprov:   no
 
 %description headers
@@ -704,8 +688,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
 
@@ -722,14 +704,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
@@ -754,7 +733,6 @@
 Summary:       Kernel documentation
 Summary(pl.UTF-8):     Dokumentacja do jÄdra Linuksa
 Group:         Documentation
-Provides:      kernel-doc = %{version}
 Autoreqprov:   no
 
 %description doc
@@ -1066,7 +1044,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 () {
@@ -1467,7 +1445,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
@@ -1539,7 +1516,6 @@
 %depmod %{kernel_release}
 
 %post headers
-rm -f %{_prefix}/src/linux%{subname}
 ln -snf %{basename:%{_kernelsrcdir}} %{_prefix}/src/linux%{subname}
 
 %postun headers
@@ -1748,6 +1724,15 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1796.2.42  2008-01-19 17:05:24  glen
+- LINUX_2_6_16 merge:
+- 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
+
 Revision 1.441.2.1796.2.41  2008-01-18 13:48:12  arekm
 - handle the AF_RXRPC problem here instead in kernel*.config files
 
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS (LINUX_2_6_22): kernel.spec - LINUX_2_6_16 merge: - drop doz...

Reply via email to