- updated to 3.4.82

[packages/kernel.git] / kernel-vanilla.spec

diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec
index 2cd7e2459d80b67ff63e8be4033a865a3ecbfea8..245e1cacfa00595a1327f99c553912c1e722ea5c 100644 (file)
--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@@ -5,7 +5,7 @@
 %{?debug:%define with_verbose 1}
 
 %define                _basever                3.4
-%define                _postver                .64
+%define                _postver                .82
 %define                _rel                    1
 
 %define                _enable_debug_packages                  0
@@ -32,8 +32,8 @@ Group:                Base/Kernel
 Source0:       http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{_basever}.tar.xz
 # Source0-md5: 967f72983655e2479f951195953e8480
 %if "%{_postver}" != "%{nil}"
-Source1:       http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Source1-md5: a00dab906f866532c6e3f63f58e9d65f
+Source1:       http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
+# Source1-md5: 1f6fcc1f91fcce2a0f71416c3251e83e
 %endif
 
 Source2:       kernel-vanilla-autoconf.h
@@ -53,8 +53,9 @@ BuildRequires:        gcc >= 5:3.2
 # for hostname command
 BuildRequires: net-tools
 BuildRequires: perl-base
-BuildRequires: rpm-build >= 4.4.9-56
-BuildRequires: rpmbuild(macros) >= 1.217
+BuildRequires: rpm >= 4.5-74
+BuildRequires: rpmbuild(macros) >= 1.652
+BuildRequires: xz >= 1:4.999.7
 Autoreqprov:   no
 Requires(post):        coreutils
 Requires(post):        geninitrd >= 12639-1
@@ -339,7 +340,7 @@ Pakiet zawiera dokumentację do jądra Linuksa pochodzącą z katalogu
 %setup -q -n linux-%{_basever}
 
 %if "%{_postver}" != "%{nil}"
-%{__bzip2} -dc %{SOURCE1} | patch -p1 -s
+%{__xz} -dc %{SOURCE1} | patch -p1 -s
 %endif
 
 %patch0 -p1
@@ -511,9 +512,10 @@ fi
 %post
 %depmod %{kernel_release}
 
+%posttrans
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
+# generate simple initramfs/initrd image
 if [[ "$USE_GENINITRD" != [Nn][Oo] ]]; then
-       # generate initrd after all dependant modules are installed
        /sbin/geninitrd -f %{initrd_dir}/initrd-%{kernel_release}.img %{kernel_release}
 fi
 
@@ -523,11 +525,11 @@ if [[ "$USE_DRACUT" != [Nn][Oo] ]] && [ -x /sbin/dracut ]; then
 fi
 
 # update boot loader
-[ -x /sbin/update-grub -a -f /etc/sysconfig/grub ] && . /etc/sysconfig/grub
-if [[ "$UPDATE_GRUB" != [Nn][Oo] ]]; then
-       /sbin/update-grub
+if [ -x /sbin/update-grub -a -f /etc/sysconfig/grub ]; then
+       if [ "$(. /etc/sysconfig/grub; echo ${UPDATE_GRUB:-yes})" = "yes" ]; then
+               /sbin/update-grub >/dev/null
+       fi
 fi
-
 if [ -x /sbin/new-kernel-pkg ]; then
        /sbin/new-kernel-pkg --initrdfile=%{initrd_dir}/initrd-%{kernel_release}.img --install %{kernel_release} --banner "TLD Linux %{alt_kernel}"
 fi