restore lost tabs

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index de80ada6212bc163c776f1da641809c303e2b34e..5e56c245fc4afdb843d2c2e92b73c6ee7d3dcd9b 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -68,7 +68,10 @@
 
 %define                rel             1
 %define                basever         3.13
-%define                postver         .3
+%define                postver         .4
+
+# define this to '-%{basever}' for longterm branch
+%define                versuffix       %{nil}
 
 # __alt_kernel is list of features, empty string if none set
 # _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros)
@@ -101,7 +104,7 @@ Summary(de.UTF-8):  Der Linux-Kernel (Kern des Linux-Betriebssystems)
 Summary(et.UTF-8):     Linuxi kernel (ehk operatsioonisüsteemi tuum)
 Summary(fr.UTF-8):     Le Kernel-Linux (La partie centrale du systeme)
 Summary(pl.UTF-8):     Jądro Linuksa
-Name:          kernel%{_alt_kernel}
+Name:          kernel%{versuffix}%{_alt_kernel}
 Version:       %{basever}%{postver}
 Release:       %{rel}
 Epoch:         3
@@ -111,7 +114,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
 # Source0-md5: 0ecbaf65c00374eb4a826c2f9f37606f
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5:  2d3d298f2b430122f4baf2af88277231
+# Patch0-md5:  77ca721ea0e8373f58f596fe0d9b1b47
 %endif
 Source1:       kernel.sysconfig
 
@@ -352,7 +355,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                objdir          %{topdir}/%{targetobj}
 %define                targetobj       %{_target_base_arch}-gcc-%(%{__cc} -dumpversion)
 
-%define                _kernelsrcdir   /usr/src/linux%{_alt_kernel}-%{version}
+%define                _kernelsrcdir   /usr/src/linux%{versuffix}%{_alt_kernel}-%{version}
 
 %if "%{_target_base_arch}" != "%{_host_base_arch}"
        %define CrossOpts ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux-
@@ -749,7 +752,7 @@ SRCARCH             := %{target_arch_dir}
 ARCH           := %{_target_base_arch}
 Q                      := %{!?with_verbose:@}
 MAKE_OPTS      := %{MakeOpts}
-DEFCONFIG   := %{defconfig}
+DEFCONFIG      := %{defconfig}
 EOF
 
 RescueConfig() {
@@ -873,12 +876,12 @@ BuildConfig() {
 %endif
 
 %ifarch i686 athlon pentium3 pentium4
-  %if %{with pae}
+       %if %{with pae}
                CONFIG_HIGHMEM4G=n
                CONFIG_HIGHMEM64G=y
                CONFIG_X86_PAE=y
                CONFIG_NUMA=n
-  %endif
+       %endif
 %endif
 
 %if %{without pcmcia}
@@ -1114,6 +1117,14 @@ fi
 
 %depmod %{kernel_release}
 
+%if %{without vserver}
+%banner -e -a kernel <<EOF
+
+WARNING: Vserver support is DISABLED in this kernel build!
+
+EOF
+%endif
+
 %posttrans
 # use posttrans to generate initrd after all dependant module packages (-drm, etc) are installed
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
@@ -1126,19 +1137,19 @@ fi
 # if dracut is present then generate full-featured initramfs
 if [[ "$USE_DRACUT" != [Nn][Oo] ]] && [ -x /sbin/dracut ]; then
        /sbin/dracut --force --quiet /boot/initramfs-%{kernel_release}.img %{kernel_release}
-        [ -n "$initrd_file" ] || initrd_file="initramfs-%{kernel_release}.img"
+       [ -n "$initrd_file" ] || initrd_file="initramfs-%{kernel_release}.img"
 fi
 
 if [[ "$CREATE_SYMLINKS" != [Nn][Oo] ]]; then
        mv -f %{initrd_dir}/initrd{,.old} 2> /dev/null
-        if [ -n "$initrd_file" ] ; then
-           ln -sf "$initrd_file" %{initrd_dir}/initrd
-        fi
+       if [ -n "$initrd_file" ] ; then
+               ln -sf "$initrd_file" %{initrd_dir}/initrd
+       fi
 %if 0%{?alt_kernel:1}
        mv -f %{initrd_dir}/initrd%{_alt_kernel}{,.old} 2> /dev/null
-        if [ -n "$initrd_file" ] ; then
-           ln -sf "$initrd_file" %{initrd_dir}/initrd%{_alt_kernel}
-        fi
+       if [ -n "$initrd_file" ] ; then
+               ln -sf "$initrd_file" %{initrd_dir}/initrd%{_alt_kernel}
+       fi
 %endif
 fi
 
@@ -1194,13 +1205,13 @@ fi
 %depmod %{kernel_release}
 
 %post headers
-ln -snf %{basename:%{_kernelsrcdir}} %{_prefix}/src/linux%{_alt_kernel}
+ln -snf %{basename:%{_kernelsrcdir}} %{_prefix}/src/linux%{versuffix}%{_alt_kernel}
 
 %postun headers
 if [ "$1" = "0" ]; then
-       if [ -L %{_prefix}/src/linux%{_alt_kernel} ]; then
-               if [ "$(readlink %{_prefix}/src/linux%{_alt_kernel})" = "linux%{_alt_kernel}-%{version}" ]; then
-                       rm -f %{_prefix}/src/linux%{_alt_kernel}
+       if [ -L %{_prefix}/src/linux%{versuffix}%{_alt_kernel} ]; then
+               if [ "$(readlink %{_prefix}/src/linux%{versuffix}%{_alt_kernel})" = "linux%{versuffix}%{_alt_kernel}-%{version}" ]; then
+                       rm -f %{_prefix}/src/linux%{versuffix}%{_alt_kernel}
                fi
        fi
 fi