X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=kernel-vanilla.spec;h=e65288e296195e0e656c30beca20ca83dd53a6c8;hb=c5f7ef63ac6dfe23ebfec50a02b253d4cb4b674e;hp=c26fa570d19a5e9b845b4b83853e02a955272c12;hpb=31eabd1e0eca2a9b0ca17b5a7ddbdc4fe795b69b;p=packages%2Fkernel.git

diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec
index c26fa57..e65288e 100644
--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@@ -5,7 +5,7 @@
 %{?debug:%define with_verbose 1}
 
 %define		_basever		3.2
-%define		_postver		.49
+%define		_postver		.59
 %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:	364066fa18767ec0ae5f4e4abcf9dc51
 %if "%{_postver}" != "%{nil}"
-Source1:	http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Source1-md5:	2c7c393c4fe719874389a5849d01a7b7
+Source1:	http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
+# Source1-md5:	68696787e651422f02816d2c825f9a9c
 %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