Author: hawk                         Date: Sat Jan 27 12:56:33 2007 GMT
Module: SPECS                         Tag: hawk-LINUX_2_6
---- Log message:
- started my own kernel.spec (our official ones are too bloated for me),
  based on kernel-vanilla.spec, will have optional vserver and/or grsecurity
  support _and nothing more_ (exceptions may be made for some serious fixes
  and/or driver updates)
- totally NFY

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1701 -> 1.441.2.1701.2.1) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1701 SPECS/kernel.spec:1.441.2.1701.2.1
--- SPECS/kernel.spec:1.441.2.1701      Sun Jan 21 22:34:11 2007
+++ SPECS/kernel.spec   Sat Jan 27 13:56:28 2007
@@ -1,108 +1,40 @@
 # $Revision$, $Date$
 #
-# TODO 2.6.19:
-#
-# - grsecurity patch update for 2.6.19.2 - 1 hunk failed in:
-#      arch/i386/kernel/smpboot.c
-#      drivers/char/mem.c
-#      scripts/Kbuild.include
-# - p4 fbsplash - needs update (bcond off)
-# - p200 linux-2.6-ppc-ICE-hacks.patch - untested - ppc needed
-# - separate PaX and grsecurity support - future
-# - update configs for up/smp i386 (almost done) 
-# - check status of kernel-suspend2.config 
-# - update configs for up/smp x86_64
-# - update configs for up/smp sparc
-# - update configs for up/smp sparc64
-# - update configs for up/smp alpha
-# - update configs for up/smp ppc
-# - update configs for up/smp ia64
-# - p5 vesafb-tng - needs update (bcond off)
-# - p51 reiser4 - needs update (bcond off)
-# - p50 imq - test (bcond off)
-#
-# FUTURE:
-# - separate PaX and grsecurity support - future
-# - update xen patch for 2.6.19 
-# - wanpipe
-# - Linux ABI
-#
 # Conditional build:
 %bcond_without smp             # don't build SMP kernel
 %bcond_without up              # don't build UP kernel
 %bcond_without source          # don't build kernel-source package
-%bcond_without pcmcia          # don't build pcmcia
 
-%bcond_with    abi             # build ABI support only ix86 !!
+%bcond_with    vserver         # build with vserver support
+%bcond_with    grsec_minimal   # build minimal grsecurity subset 
(proc,link,fifo,shm)
 %bcond_with    grsec_full      # build full grsecurity
-%bcond_with    pax             # build PaX and full grsecurity (todo: separate)
-%bcond_with    verbose         # verbose build (V=1)
-%bcond_with    xen0            # added Xen0 support
-%bcond_with    xenU            # added XenU support
-%bcond_with    reiser4         # support for reiser4 fs
-
-%bcond_without grsecurity      # don't build grsecurity at all
-%bcond_without grsec_minimal   # build only minimal subset (proc,link,fifo,shm)
-%bcond_without old_netfilter   # don't build old netfilter module [not 
supported in this time may not work]
 
-%bcond_with    fbsplash        # fbsplash instead of bootsplash
-%bcond_with    vesafb_tng      # vesafb-tng, vesafb replacement from gentoo
+%bcond_with    verbose         # verbose build (V=1)
 %bcond_with    pae             # build PAE (HIGHMEM64G) support on uniprocessor
-%bcond_with    nfsroot         # build with root on NFS support
-
-%bcond_without ide_acpi        # support for ide-acpi from SuSE
-%bcond_without imq             # imq support
+%bcond_with    preempt-nort    # build preemptable no realtime kernel
 
 %{?debug:%define with_verbose 1}
 
-%if %{without grsecurity}
-%undefine      with_grsec_full
-%undefine      with_grsec_minimal
-%undefine      with_pax
-%endif
-
-%if %{with pax}
-%undefine      with_grsec_minimal
-%undefine      with_grsec_full
-%define                with_grsecurity         1
-%endif
-
-%if %{with grsec_full}
-%undefine      with_grsec_minimal
-%define                with_grsecurity         1
-%endif
-                                                                               
                                                                                
                     
-%if %{with grsec_minimal}                                                      
                                                                                
                    
-%undefine      with_grsec_full
-%define                with_grsecurity         1
-%undefine      with_pax
-%endif
-
-%ifarch ia64
-# broken
-%undefine      with_up
-%endif
-
 %ifnarch %{ix86}
-%undefine      abi
+%undefine      with_pae
 %endif
 
-%define                have_drm        1
-%define                have_oss        1
-%define                have_sound      1
-
-%ifarch %{ix86} alpha ppc
+%ifarch %{ix86} ppc
 %define                have_isa        1
 %else
 %define                have_isa        0
 %endif
 
 %ifarch sparc sparc64
-%undefine      with_pcmcia
-%define                have_drm        0
+%define                have_pcmcia     0
 %define                have_oss        0
+%else
+%define                have_pcmcia     1
+%define                have_oss        1
 %endif
 
+%define                have_sound      1
+
 ## Program required by kernel to work.
 %define                _binutils_ver           2.12.1
 %define                _util_linux_ver         2.10o
@@ -110,7 +42,6 @@
 %define                _e2fsprogs_ver          1.29
 %define                _jfsutils_ver           1.1.3
 %define                _reiserfsprogs_ver      3.6.3
-%define                _reiser4progs_ver       1.0.0
 %define                _xfsprogs_ver           2.6.0
 %define                _pcmcia_cs_ver          3.1.21
 %define                _pcmciautils_ver        004
@@ -121,246 +52,48 @@
 %define                _procps_ver             3.2.0
 %define                _oprofile_ver           0.9
 %define                _udev_ver               071
-%define                _mkvmlinuz_ver          1.3
-
-%define                _rel                    0.1
-
-%define                _old_netfilter_snap     20060504
-%define                _netfilter_snap         20061213
-%define                _nf_hipac_ver           0.9.1
-
-%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.1
-%define                suspend_version         2.2.9
-
-%define                xen_version             3.0.2
 
+%define                _basever        2.6.19
+%define                _postver        .2
+%define                _rel            1
+%define                _rc     %{nil}
 Summary:       The Linux kernel (the core of the Linux operating system)
 Summary(de):   Der Linux-Kernel (Kern des Linux-Betriebssystems)
 Summary(fr):   Le Kernel-Linux (La partie centrale du systeme)
 Summary(pl):   Jądro Linuksa
-Name:          
kernel%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
-%define                _basever        2.6.21
-%define                _postver        %{nil}
+Name:          kernel-%{alt_kernel}
 Version:       %{_basever}%{_postver}
 Release:       %{_rel}
 Epoch:         3
 License:       GPL v2
 Group:         Base/Kernel
-%define                _rc     %{nil}
-#define                _rc     -rc7
-#Source0:      
ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-%{version}%{_rc}.tar.bz2
-Source0:       
http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{_basever}%{_rc}.tar.bz2
+Source0:       
http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{_basever}.tar.bz2
 # Source0-md5: 443c265b57e87eadc0c677c3acc37e20
 %if "%{_postver}" != "%{nil}"
 Source1:       http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
 # Source1-md5: e8a9a6dc65da3f7b192e7caa969f9a1b
 %endif
-Source3:       kernel-autoconf.h
-Source4:       kernel-config.h
-Source5:       kernel-ppclibs.Makefile
-Source7:       kernel-module-build.pl
-
-#Source10:     
http://suspend2.net/downloads/all/suspend2-%{suspend_version}-for-2.6.19-rc6.patch.bz2
-##Source10-md5:        ce94df22b93c74f1637d2429c1093ec7
-#Source12:     
ftp://ftp.namesys.com/pub/reiser4-for-2.6/2.6.17/reiser4-for-2.6.17-3.patch.gz
-##Source12-md5:        593c3296ddf40c5b116ee129781da341
-#Source14:     
http://ace-host.stuart.id.au/russell/files/debian/sarge/kernel-patch-linuxabi/kernel-patch-linuxabi_20060404.tar.gz
-##Source14-md5:        f2563a2d748c7480559e8d3ff77eb18a
-
-Source20:      kernel-i386.config
-Source21:      kernel-i386-smp.config
-Source22:      kernel-x86_64.config
-Source23:      kernel-x86_64-smp.config
-Source24:      kernel-sparc.config
-Source25:      kernel-sparc-smp.config
-Source26:      kernel-sparc64.config
-Source27:      kernel-sparc64-smp.config
-Source28:      kernel-alpha.config
-Source29:      kernel-alpha-smp.config
-Source30:      kernel-ppc.config
-Source31:      kernel-ppc-smp.config
-Source32:      kernel-ia64.config
-Source33:      kernel-ia64-smp.config
-Source34:      kernel-abi.config
-
-Source40:      kernel-netfilter.config
-Source41:      kernel-squashfs.config
-Source42:      kernel-suspend2.config
-Source43:      kernel-vserver.config
-Source44:      kernel-vesafb-tng.config
-Source45:      kernel-grsec.config
-Source46:      kernel-xen0.config
-Source47:      kernel-xenU.config
-
-Source49:      kernel-pax.config
-Source50:      kernel-no-pax.config
-Source55:      kernel-imq.config
-
-###
-#      Patches
-###
-
-Patch0:                linux-net-2.6.19.patch
-#
-# PATA ports on SATA Promise controller; patch based on:
-# 
http://cvs.fedora.redhat.com/viewcvs/*checkout*/rpms/kernel/devel/linux-2.6-sata-promise-pata-ports.patch
-#
-Patch1:                linux-2.6-sata-promise-pata-ports.patch
-
-# tahoe9XX http://tahoe.pl/drivers/tahoe9xx-2.6.11.5.patch
-Patch2:                tahoe9xx-2.6.11.5.patch
-
-#      
ftp://ftp.openbios.org/pub/bootsplash/kernel/bootsplash-3.1.6-2.6.15.diff
-Patch3:                bootsplash-3.1.6-2.6.15.diff
-#      
http://dev.gentoo.org/~spock/projects/gensplash/archive/fbsplash-0.9.2-r5-2.6.19-rc2.patch
-Patch4:                fbsplash-0.9.2-r5-2.6.19-rc2.patch
-
-# vesafb-tng: 
http://dev.gentoo.org/~spock/projects/vesafb-tng/archive/vesafb-tng-1.0-rc2-2.6.19-rc2.patch
-Patch5:                vesafb-tng-1.0-rc2-2.6.19-rc2.patch
-
-# squashfs based on 
http://mesh.dl.sourceforge.net/sourceforge/squashfs/squashfs3.1-r2.tar.gz
-# from linux-2.6.18 with squashfs3.1-r2_for_2.6.19.patch applied
-Patch6:                squashfs%{squashfs_version}-patch
-Patch7:                linux-alpha-isa.patch
-Patch8:                linux-fbcon-margins.patch
-Patch9:                linux-static-dev.patch
-
-# netfilter p-o-m-ng snap 20061213
-
-# base
-Patch10:       pom-ng-IPV4OPTSSTRIP-%{_netfilter_snap}.patch
-Patch14:       pom-ng-ipv4options-%{_netfilter_snap}.patch
-Patch20:       pom-ng-set-%{_netfilter_snap}.patch
-Patch22:       pom-ng-u32-%{_netfilter_snap}.patch
-
-# extra
-Patch32:       pom-ng-ROUTE-%{_netfilter_snap}.patch
-Patch33:       pom-ng-TARPIT-%{_netfilter_snap}.patch
-Patch34:       pom-ng-mms-conntrack-nat-%{_netfilter_snap}.patch
-Patch37:       pom-ng-rsh-%{_netfilter_snap}.patch
-
-#external
-Patch40:       pom-ng-IPMARK-%{_netfilter_snap}.patch
-Patch41:       pom-ng-connlimit-%{_netfilter_snap}.patch
-Patch42:       pom-ng-geoip-%{_netfilter_snap}.patch
-Patch43:       pom-ng-ipp2p-%{_netfilter_snap}.patch
-Patch44:       pom-ng-time-%{_netfilter_snap}.patch
-
-#layer7 with temporary fix
-Patch48:       kernel-2.6.18-layer7-2.7.patch
-Patch49:       kernel-2.6.18-layer7-2.7-2.6.19-fix.patch
-
-# netfilter patches preparation order:
-#
-# [pom base]
-# can be independently applied on 2.6.19.1 source:
-#      pom-ng-IPV4OPTSSTRIP-20061213.patch
-#      pom-ng-ipv4options-20061213.patch
-#      pom-ng-set-20061213.patch
-#      pom-ng-u32-20061213.patch
-# [pom extra]
-#      pom-ng-ROUTE-20061213.patch
-#      pom-ng-TARPIT-20061213.patch
-#      pom-ng-mms-conntrack-nat-20061213.patch
-# all below applied to sources with all preceeding patches applied:
-#      pom-ng-rsh-20061213.patch
-# [pom external]
-#      pom-ng-IPMARK-20061213.patch
-#      pom-ng-connlimit-20061213.patch
-#      pom-ng-geoip-20061213.patch
-#      pom-ng-ipp2p-20061213.patch
-#      pom-ng-time-20061213.patch
-#
-# layer7: 
-#      kernel-2.6.18-layer7-2.7.patch
-
-###
-#      End netfilter
-###
-
-# based on 2.6.17 patch from 
http://www.linuximq.net/patchs/linux-2.6.17-imq1.diff, 
-# some stuff moved from net/sched/sch_generic.c to net/core/dev.c for 2.6.19 
-# compatibility. not tested. 
-
-Patch50:       linux-2.6.19-imq1.diff
-
-# from http://laurent.riffard.free.fr/reiser4/reiser4-for-2.6.19.patch.gz
-# based on 
http://ftp.namesys.com/pub/reiser4-for-2.6/2.6.18/reiser4-for-2.6.18-3.patch.gz
-# with 9 pathes from reiserfs mailing-list.
-# details http://www.mail-archive.com/[email protected]/msg22492.html
-Patch51:       reiser4-for-2.6.19.patch
-
-# esfq
-# from http://fatooh.org/esfq-2.6/current/esfq-kernel.patch
-Patch53:       esfq-kernel.patch
-# from http://memebeam.org/free-software/toshiba_acpi/
-Patch54:       linux-2.6-toshiba_acpi_0.18-dev_toshiba_test4.patch
-# by Baggins request:
-# derived from 
ftp://ftp.cmf.nrl.navy.mil/pub/chas/linux-atm/vbr/vbr-kernel-diffs
-Patch55:       linux-2.6-atm-vbr.patch
-Patch56:       linux-2.6-atmdd.patch
-
-Patch57:       linux-2.6-cpuset_virtualization.patch
-
-# Derived from 
http://www.skd.de/e_en/products/adapters/pci_64/sk-98xx_v20/software/linux/driver/install-8_36.tar.bz2
-Patch60:       linux-2.6-sk98lin-8.36.1.3.patch
-
-# http://www.suspend2.net/downloads/all/suspend2-2.2.9-for-2.6.19-rc6.patch.bz2
-Patch69:       suspend2-2.2.9-for-2.6.19-rc6.patch
-Patch70:       linux-2.6-suspend2-avoid-redef.patch
-Patch71:       linux-2.6-suspend2-page.patch
-#Patch72:      linux-2.6-suspend2-off.patch
-Patch72:       kernel-2.6-ueagle-atm-freezer.patch
-
-# Fix for pcie cards against 2.6.18.1 from ftp://lwfinger.dynalias.org/patches
-Patch73:       kernel-bcm43xx-patch_2.6.18.1_for_PCI-E.patch
-
-# ide-acpi instead of nx8220 s3 suspend/resume hack
-# 
http://svn.uludag.org.tr/pardus/devel/kernel/kernel/files/suse/ide-acpi-support.patch
-Patch75:       linux-2.6.17-ide-acpi-support.patch
-
-# cx88-blackbird based tv tuner card audio fix
-Patch80:       linux-2.6.19-cx88-tvaudio.patch
-
-# see comments on http://lkml.org/lkml/2006/12/12/339
-Patch81:       linux-2.6.19-atiixp-legacy.patch
-
-# adds some ids for hostap suported cards and monitor_enable from/for 
aircrack-ng
-# http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch 
-Patch85:       hostap-kernel-2.6.18.patch
-
-# http://vserver.13thfloor.at/Experimental/patch-2.6.19.1-vs2.3.0.6.diff
-Patch100:      linux-2.6-vs2.3.patch
-Patch101:      linux-2.6-vs2.1-suspend2.patch
-Patch102:      linux-2.6-vs2.1-128IPs.patch
-
-# from 
http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-3.0.2-src.tgz
-#Patch120:     xen-3.0-2.6.16.patch
-
-# Wake-On-Lan fix for nForce drivers; using 
http://atlas.et.tudelft.nl/verwei90/nforce2/wol.html
-# Fix verified for that kernel version.
-Patch130:      linux-2.6-forcedeth-WON.patch
-
-Patch200:      linux-2.6-ppc-ICE-hacks.patch
-
-# http://www.ssi.bg/~ja/routes-2.6.19-12.diff
-Patch300:      routes-2.6.19-12.diff
-
-Patch1000:     linux-2.6-grsec-minimal.patch
-
-Patch2000:     kernel-small_fixes.patch
-#wanpipe
-#Patch3000:    wanpipe-beta7-2.3.4.patch
 
-# use 
http://www.grsecurity.net/~spender/grsecurity-2.1.9-2.6.19.1-200612121859.patch
-Patch9999:     grsecurity-2.1.9-2.6.19.1.patch
+Source2:       kernel-module-build.pl
+Source3:       kernel-config.h
+
+Source20:      kernel-common.config
+Source21:      kernel-i386.config
+Source22:      kernel-i386-smp.config
+Source23:      kernel-x86_64.config
+Source24:      kernel-x86_64-smp.config
+Source25:      kernel-ppc.config
+Source26:      kernel-ppc-smp.config
+Source27:      kernel-alpha.config
+Source28:      kernel-alpha-smp.config
+Source29:      kernel-sparc64.config
+Source30:      kernel-sparc64-smp.config
+Source31:      kernel-sparc.config
+Source32:      kernel-sparc-smp.config
+
+Source40:      kernel-preempt-nort.config
+Source41:      kernel-no-preempt-nort.config
+Source42:      kernel-netfilter.config
 
 URL:           http://www.kernel.org/
 BuildRequires: binutils >= 3:2.14.90.0.7
@@ -373,33 +106,20 @@
 BuildRequires: net-tools
 BuildRequires: perl-base
 BuildRequires: rpmbuild(macros) >= 1.217
+BuildRequires: sed >= 4.0
 Autoreqprov:   no
-Requires(post):        coreutils
-Requires(post):        geninitrd >= 2.57
-Requires(post):        module-init-tools >= 0.9.9
 Requires:      coreutils
 Requires:      geninitrd >= 2.57
 Requires:      module-init-tools >= 0.9.9
 Provides:      %{name}-up = %{epoch}:%{version}-%{release}
 Provides:      kernel = %{epoch}:%{version}-%{release}
-Provides:      kernel(netfilter) = %{_netfilter_snap}
-Provides:      kernel(nf-hipac) = %{_nf_hipac_ver}
 Provides:      kernel(realtime-lsm) = 0.1.1
-%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-misc-fuse
-Obsoletes:     kernel-modules
-Obsoletes:     kernel-net-hostap
-Obsoletes:     kernel-net-ieee80211
-Obsoletes:     kernel-net-ipp2p
 Conflicts:     e2fsprogs < %{_e2fsprogs_ver}
 Conflicts:     isdn4k-utils < %{_isdn4k_utils_ver}
 Conflicts:     jfsutils < %{_jfsutils_ver}
@@ -409,86 +129,69 @@
 Conflicts:     ppp < %{_ppp_ver}
 Conflicts:     procps < %{_procps_ver}
 Conflicts:     quota-tools < %{_quota_tools_ver}
-Conflicts:     reiser4progs < %{_reiser4progs_ver}
 Conflicts:     reiserfsprogs < %{_reiserfsprogs_ver}
 Conflicts:     udev < %{_udev_ver}
 Conflicts:     util-linux < %{_util_linux_ver}
-Conflicts:     vserver-packages
 Conflicts:     xfsprogs < %{_xfsprogs_ver}
-%if %{with xen0} || %{with xenU}
-ExclusiveArch: %{ix86}
-%else
-ExclusiveArch: %{ix86} alpha %{x8664} ia64 ppc ppc64 sparc sparc64 arm
-%endif
+ExclusiveArch: %{ix86} alpha %{x8664} ppc sparc sparc64
 ExclusiveOS:   Linux
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # No ELF objects there to strip (skips processing 27k files)
 %define                _noautostrip    .*%{_kernelsrcdir}/.*
 
-%ifarch ia64
-%define                initrd_dir      /boot/efi
-%else
 %define                initrd_dir      /boot
-%endif
 
 # kernel release (used in filesystem and eventually in uname -r)
 # modules will be looked from /lib/modules/%{kernel_release}%{?smp}
 # _localversion is just that without version for "> localversion"
 %define                _localversion %{release}
-%define                kernel_release %{version}-%{_localversion}
-%define                _kernelsrcdir   /usr/src/linux-%{version}
+%define                kernel_release %{version}_%{alt_kernel}-%{_localversion}
+%define                _kernelsrcdir   /usr/src/linux-%{version}_%{alt_kernel}
 
+%define        CommonOpts      HOSTCC="%{__cc}" HOSTCFLAGS="-Wall 
-Wstrict-prototypes %{rpmcflags} -fomit-frame-pointer"
 %if "%{_target_base_arch}" != "%{_arch}"
-       %define CrossOpts ARCH=%{_target_base_arch} 
CROSS_COMPILE=%{_target_cpu}-pld-linux-
+       %define MakeOpts %{CommonOpts} ARCH=%{_target_base_arch} 
CROSS_COMPILE=%{_target_cpu}-pld-linux-
        %define DepMod /bin/true
 
        %if "%{_arch}" == "sparc" && "%{_target_base_arch}" == "sparc64"
+       %undefine CommonOpts
+       %define MakeOpts ARCH=%{_target_base_arch} 
CROSS_COMPILE=%{_target_cpu}-pld-linux-
        %define DepMod /sbin/depmod
        %endif
 
+
        %if "%{_arch}" == "x86_64" && "%{_target_base_arch}" == "i386"
-       %define CrossOpts ARCH=%{_target_base_arch}
+       %define MakeOpts %{CommonOpts} CC="%{__cc}" ARCH=%{_target_base_arch}
        %define DepMod /sbin/depmod
        %endif
 
 %else
-       %define CrossOpts CC="%{__cc}"
+       %define MakeOpts %{CommonOpts} CC="%{__cc}"
        %define DepMod /sbin/depmod
 %endif
 
+%define __features Enabled features:\
+%{?debug:- DEBUG}\
+%define Features_smp %(echo "%{__features}" | sed '/^$/d')
+%define Features_up %(echo "%{__features}
+%{?with_pae:- PAE (HIGHMEM64G) support}" | sed '/^$/d')
+# vim: "
+
 %description
 This package contains the Linux kernel that is used to boot and run
 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}
-%{!?without_old_netfilter:Old netfilter module dated: %{_old_netfilter_snap}}
-%{?with_abi:Linux ABI suppor - enabled}
-%{?with_grsec_full:Grsecurity full support - enabled}
-%{?with_pax:PaX and Grsecurity full support - enabled}
-%{?with_xen0:Xen 0 - enabled}
-%{?with_xenU:Xen U - enabled}
-%{?with_fbsplash:Fbsplash - enabled }
-%{?with_vesafb_tng:VesaFB New generation - enabled}
-%{?with_nfsroot:Root on NFS - enabled}
+%{Features_up}
 
 %description -l de
-Das Kernel-Paket enthält den Linux-Kernel (vmlinuz), den Kern des
+Das Kernel-Packet enthält den Linux-Kernel (vmlinuz), den Kern des
 Linux-Betriebssystems. Der Kernel ist für grundliegende
 Systemfunktionen verantwortlich: Speicherreservierung,
 Prozeß-Management, Geräte Ein- und Ausgaben, usw.
 
-Netfilter module dated: %{_netfilter_snap}
-%{!?without_old_netfilter:Old netfilter module dated: %{_old_netfilter_snap}}
-%{?with_abi:Linux ABI suppor - enabled}
-%{?with_grsec_full:Grsecurity full support - enabled}
-%{?with_pax:PaX and Grsecurity full support - enabled}
-%{?with_xen0:Xen 0 - enabled}
-%{?with_xenU:Xen U - enabled}
-%{?with_fbsplash:Fbsplash - enabled }
-%{?with_vesafb_tng:VesaFB New generation - enabled}
-%{?with_nfsroot:Root on NFS - enabled}
+%{Features_up}
 
 %description -l fr
 Le package kernel contient le kernel linux (vmlinuz), la partie
@@ -496,46 +199,33 @@
 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}
-%{!?without_old_netfilter:Old netfilter module dated: %{_old_netfilter_snap}}
-%{?with_abi:Linux ABI suppor - enabled}
-%{?with_grsec_full:Grsecurity full support - enabled}
-%{?with_pax:PaX and Grsecurity full support - enabled}
-%{?with_xen0:Xen 0 - enabled}
-%{?with_xenU:Xen U - enabled}
-%{?with_fbsplash:Fbsplash - enabled }
-%{?with_vesafb_tng:VesaFB New generation - enabled}
-%{?with_nfsroot:Root on NFS - enabled}
+%{Features_up}
 
 %description -l pl
 Pakiet zawiera jądro Linuksa niezbędne do prawidłowego działania
 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}
-%{!?without_old_netfilter:Old netfilter module dated: %{_old_netfilter_snap}}
-%{?with_abi:Linux ABI suppor - enabled}
-%{?with_grsec_full:Grsecurity full support - enabled}
-%{?with_pax:PaX and Grsecurity full support - enabled}
-%{?with_xen0:Xen 0 - enabled}
-%{?with_xenU:Xen U - enabled}
-%{?with_fbsplash:Fbsplash - enabled }
-%{?with_vesafb_tng:VesaFB New generation - enabled}
-%{?with_nfsroot:Root on NFS - enabled}
+%{Features_up}
 
 %package vmlinux
 Summary:       vmlinux - uncompressed kernel image
+Summary(de):   vmlinux - dekompressiertes Kernel Bild
 Summary(pl):   vmlinux - rozpakowany obraz jądra
 Group:         Base/Kernel
 
 %description vmlinux
 vmlinux - uncompressed kernel image.
 
+%description vmlinux -l de
+vmlinux - dekompressiertes Kernel Bild.
+
 %description vmlinux -l pl
 vmlinux - rozpakowany obraz jądra.
 
<<Diff was trimmed, longer than 597 lines>>

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

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

Reply via email to