From: Marcin Krol Date: Mon, 6 Feb 2012 16:43:41 +0000 (+0000) Subject: - updated BRs X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=062711b5117a54719bdc0986fceafa43b1b36920;p=packages%2Fkernel.git - updated BRs - more cleaning up --- diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index c79a756..fb976df 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -6,7 +6,7 @@ %define _basever 3.2 %define _postver .4 -%define _rel 0.1 +%define _rel 1 %define _enable_debug_packages 0 @@ -56,12 +56,12 @@ BuildRequires: rpm-build >= 4.4.9-56 BuildRequires: rpmbuild(macros) >= 1.217 Autoreqprov: no Requires(post): coreutils -Requires(post): geninitrd >= 2.57 -Requires(post): module-init-tools >= 0.9.9 +Requires(post): geninitrd >= 10000-3 +Requires(post): virtual(module-tools) Requires: /sbin/depmod Requires: coreutils -Requires: geninitrd >= 2.57 -Requires: module-init-tools >= 0.9.9 +Requires: geninitrd >= 10000-3 +Requires: virtual(module-tools) Obsoletes: kernel%{_alt_kernel}-firmware Obsoletes: kernel%{_alt_kernel}-isdn-mISDN Obsoletes: kernel-misc-acer_acpi @@ -76,7 +76,6 @@ Obsoletes: kernel-smp Conflicts: e2fsprogs < 1.29 Conflicts: isdn4k-utils < 3.1pre1 Conflicts: jfsutils < 1.1.3 -Conflicts: module-init-tools < 0.9.10 Conflicts: nfs-utils < 1.0.5 Conflicts: oprofile < 0.9 Conflicts: ppp < 1:2.4.0 @@ -126,38 +125,28 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define DepMod /sbin/depmod %endif -%define Features %(echo "%{__features}" | sed '/^$/d') - %description This package contains the Linux kernel that is used to boot and run your system. It contains few device drivers for specific hardware. Most hardware is instead supported by modules loaded after booting. -%{Features} - %description -l de.UTF-8 Das Kernel-Paket enthält den Linux-Kernel (vmlinuz), den Kern des Linux-Betriebssystems. Der Kernel ist für grundliegende Systemfunktionen verantwortlich: Speicherreservierung, Prozeß-Management, Geräte Ein- und Ausgaben, usw. -%{Features} - %description -l fr.UTF-8 Le package kernel contient le kernel linux (vmlinuz), la partie centrale d'un système d'exploitation Linux. Le noyau traite les fonctions basiques d'un système d'exploitation: allocation mémoire, allocation de process, entrée/sortie de peripheriques, etc. -%{Features} - %description -l pl.UTF-8 Pakiet zawiera jądro Linuksa niezbędne do prawidłowego działania Twojego komputera. Zawiera w sobie sterowniki do sprzętu znajdującego się w komputerze, takiego jak sterowniki dysków itp. -%{Features} - %package vmlinux Summary: vmlinux - uncompressed kernel image Summary(de.UTF-8): vmlinux - dekompressiertes Kernel Bild