X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=kernel-vanilla.spec;h=c847ed51c4511d1ef531571f828428af45809718;hb=89f63064b62d3e12b71774e20b1b19d020dcb9d0;hp=7b0680abf61607930c71af25f1e6cfabdd317e65;hpb=3e6cf2476a5cddf1e028fc2289ac3c94524b7e62;p=packages%2Fkernel.git

diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec
index 7b0680a..c847ed5 100644
--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@@ -5,8 +5,8 @@
 %{?debug:%define with_verbose 1}
 
 %define		_basever		3.2
-%define		_postver		.50
-%define		_rel			2
+%define		_postver		.55
+%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:	a6e63babb2a4aab91c2eb33430de9588
+Source1:	http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
+# Source1-md5:	34ddf28325523fd3f467113f524d92c4
 %endif
 
 Source2:	kernel-vanilla-autoconf.h
@@ -45,7 +45,6 @@ Source10:	kernel-vanilla-x86.config
 Source11:	kernel-vanilla-x86_64.config
 
 Patch0:		kernel-vanilla-small_fixes.patch
-Patch1:		3.2.50-build-fix.patch
 
 URL:		http://www.kernel.org/
 BuildRequires:	binutils >= 3:2.18
@@ -54,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
@@ -340,11 +340,10 @@ 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
-%patch1 -p1
 
 # Fix EXTRAVERSION in main Makefile
 sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = -%{alt_kernel}#g' Makefile
@@ -513,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
 
@@ -525,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