R: virtual(module-tools) instead of module-init-tools

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index a0d7545a31acc88bd79e10b124dd9c19417831e0..bdf100688c0a73389da71bf237f9da5f7fc91c80 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -92,9 +92,7 @@
 
 %define                rel             0.1
 %define                basever         3.2
-%define                postver         .0
-
-%define                module_init_tools_ver   3.16
+%define                postver         .1
 
 # __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)
@@ -137,7 +135,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
 # Source0-md5: 364066fa18767ec0ae5f4e4abcf9dc51
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Patch0-md5:  13ea1e611a0a580138b8203e6f1353ed
+# Patch0-md5:  31fc34340f11118873463a1d59d47b7f
 %endif
 
 Source3:       kernel-autoconf.h
@@ -210,9 +208,6 @@ Patch52:    kernel-wrr.patch
 # http://fatooh.org/esfq-2.6/sfq-2.6.24.1.tar.bz2
 Patch53:       kernel-esfq.patch
 
-# http://memebeam.org/free-software/toshiba_acpi/toshiba_acpi-dev_toshiba_test5-linux_2.6.26.patch
-Patch54:       kernel-toshiba_acpi.patch
-
 # by Baggins request:
 # derived from ftp://ftp.cmf.nrl.navy.mil/pub/chas/linux-atm/vbr/vbr-kernel-diffs
 Patch55:       kernel-atm-vbr.patch
@@ -240,7 +235,7 @@ Patch140:   kernel-unionfs.patch
 # cat aufs3-kbuild.patch aufs3-base.patch aufs3-standalone.patch > ~/rpm/packages/kernel/kernel-aufs3.patch
 # mkdir linux
 # cp -a Documentation fs include linux
-# diff -urN /usr/share/empty linux >> ~/rpm/packages/kernel/kernel-aufs3.patch 
+# diff -urN /usr/share/empty linux >> ~/rpm/packages/kernel/kernel-aufs3.patch
 #
 Patch145:      kernel-aufs3.patch
 Patch146:      kernel-aufs2-unionfs.patch
@@ -293,31 +288,32 @@ BuildRequires:    gcc >= 5:3.2
 BuildRequires: xz >= 1:4.999.7
 AutoReqProv:   no
 BuildRequires: hostname
-BuildRequires: module-init-tools >= %{module_init_tools_ver}
+BuildRequires: virtual(module-tools)
 BuildRequires: perl-base
 BuildRequires: rpm-build >= 4.5-24
 BuildRequires: rpmbuild(macros) >= 1.217
 Requires(post):        coreutils
 Requires(post):        geninitrd >= 10000-3
-Requires(post):        module-init-tools >= %{module_init_tools_ver}
+Requires(post):        virtual(module-tools)
 Requires:      /sbin/depmod
 Requires:      coreutils
 Requires:      geninitrd >= 10000-3
-Requires:      module-init-tools >= %{module_init_tools_ver}
+Requires:      virtual(module-tools)
 %if %{with pae}
 %ifarch i686 athlon pentium3 pentium4
 Requires:      cpuinfo(pae)
 %endif
 %endif
 Suggests:      keyutils
+Suggests:      linux-firmware
 Provides:      %{name}(netfilter) = 20070806
 Provides:      %{name}(vermagic) = %{kernel_release}
-Obsoletes:     kernel%{_alt_kernel}-isdn-mISDN
 Obsoletes:     kernel%{_alt_kernel}-char-lirc-ene0100
 Obsoletes:     kernel%{_alt_kernel}-char-lirc-it87
 Obsoletes:     kernel%{_alt_kernel}-char-lirc-ite8709
 Obsoletes:     kernel%{_alt_kernel}-char-lirc-mceusb
 Obsoletes:     kernel%{_alt_kernel}-char-lirc-streamzap
+Obsoletes:     kernel%{_alt_kernel}-isdn-mISDN
 Obsoletes:     kernel-firmware
 Obsoletes:     kernel-misc-acer_acpi
 Obsoletes:     kernel-misc-fuse
@@ -333,6 +329,7 @@ Conflicts:  e2fsprogs < 1.29
 Conflicts:     isdn4k-utils < 3.1pre1
 Conflicts:     jfsutils < 1.1.3
 Conflicts:     lvm2 < 2.02.40
+Conflicts:     module-init-tools < 3.16
 Conflicts:     nfs-utils < 1.0.5
 Conflicts:     oprofile < 0.9
 Conflicts:     ppp < 1:2.4.0
@@ -711,9 +708,6 @@ sed -i 's/-Werror//' arch/alpha/kernel/Makefile
 %patch52 -p1
 %endif
 
-# toshiba_acpi
-%patch54 -p1
-
 %patch55 -p1
 %patch56 -p1