X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=kernel-vanilla.spec;h=d2a0b55468d4e8b06075d92cf01f42039f7ea220;hb=5c5a4abb8c78b4360e2f0cff9b64da926bacabed;hp=7db600b102401bd65a681f7c825d9e7ac44716ec;hpb=65799df8a16879958ceee6f8b4e926a9b459aec2;p=packages%2Fkernel.git diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 7db600b..d2a0b55 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -5,7 +5,7 @@ %{?debug:%define with_verbose 1} %define _basever 3.2 -%define _postver .5 +%define _postver .16 %define _rel 1 %define _enable_debug_packages 0 @@ -33,7 +33,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{_basever}.tar.bz2 # Source0-md5: 7ceb61f87c097fc17509844b71268935 %if "%{_postver}" != "%{nil}" Source1: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2 -# Source1-md5: fb4d0b76b4c9a42977d75c4b2f3948d0 +# Source1-md5: 1179d169e0ec15ada29cfa9066777a7f %endif Source2: kernel-vanilla-autoconf.h @@ -76,6 +76,7 @@ Obsoletes: kernel-smp Conflicts: e2fsprogs < 1.29 Conflicts: isdn4k-utils < 3.1pre1 Conflicts: jfsutils < 1.1.3 +Conflicts: module-init-tools < 3.16 Conflicts: nfs-utils < 1.0.5 Conflicts: oprofile < 0.9 Conflicts: ppp < 1:2.4.0 @@ -343,7 +344,7 @@ Pakiet zawiera dokumentację do jądra Linuksa pochodzącą z katalogu %patch0 -p1 # Fix EXTRAVERSION in main Makefile -sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}-%{alt_kernel}#g' Makefile +sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = -%{alt_kernel}#g' Makefile # cleanup backups after patching find '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -f