From 1b7b015fc71c5068fd51129f9ca6427aea4b42c0 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 15 Jan 2010 14:10:23 +0000 Subject: [PATCH] - version 004 - Resolves: rhbz#529339 rhbz#533494 rhbz#548550 - Resolves: rhbz#548555 rhbz#553195 --- .cvsignore | 2 +- dracut.spec | 40 ++++++++++++++++++++++++++++++++++++---- sources | 2 +- 3 files changed, 38 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 415f317..208a4cd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -dracut-003.tar.bz2 +dracut-004.tar.bz2 diff --git a/dracut.spec b/dracut.spec index f1a3b31..682c57a 100644 --- a/dracut.spec +++ b/dracut.spec @@ -19,8 +19,8 @@ %endif Name: dracut -Version: 003 -Release: 2%{?rdist} +Version: 004 +Release: 1%{?rdist} Summary: Initramfs generator using udev Group: System Environment/Base License: GPLv2+ @@ -29,6 +29,16 @@ URL: http://apps.sourceforge.net/trac/dracut/wiki # http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=snapshot;h=%{?dashgittag};sf=tgz Source0: dracut-%{version}%{?dashgittag}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +%if 0%{?fedora} > 12 || 0%{?rhel} >= 6 +# no "provides", because dracut does not offer +# all functionality of the obsoleted packages +Obsoletes: mkinitrd <= 6.0.93 +Obsoletes: mkinitrd-devel <= 6.0.93 +Obsoletes: nash <= 6.0.93 +Obsoletes: libbdevid-python <= 6.0.93 +%endif + Requires: udev Requires: util-linux-ng Requires: module-init-tools >= 3.7-9 @@ -48,8 +58,8 @@ Requires: lvm2 >= 2.02.33-9, dhclient Requires: filesystem >= 2.1.0, cpio, device-mapper, initscripts >= 8.63-1 Requires: e2fsprogs >= 1.38-12, libselinux, libsepol, coreutils Requires: mdadm, elfutils-libelf -Requires(pre): plymouth >= 0.7.0 -Requires: plymouth >= 0.7.0 +Requires(pre): plymouth >= 0.8.0-0.2009.29.09.19.1 +Requires: plymouth >= 0.8.0-0.2009.29.09.19.1 Requires: cryptsetup-luks Requires: file Requires: bzip2 @@ -148,6 +158,11 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/dracut/overlay mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log touch $RPM_BUILD_ROOT%{_localstatedir}/log/dracut.log +%if 0%{?fedora} <= 12 && 0%{?rhel} < 6 +rm $RPM_BUILD_ROOT/sbin/mkinitrd +rm $RPM_BUILD_ROOT/sbin/lsinitrd +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -158,6 +173,10 @@ rm -rf $RPM_BUILD_ROOT %if 0%{?with_switch_root} /sbin/switch_root %endif +%if 0%{?fedora} > 12 || 0%{?rhel} >= 6 +/sbin/mkinitrd +/sbin/lsinitrd +%endif %dir %{_datadir}/dracut %{_datadir}/dracut/dracut-functions %config(noreplace) /etc/dracut.conf @@ -167,6 +186,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/dracut/modules.d/10redhat-i18n %{_datadir}/dracut/modules.d/10rpmversion %{_datadir}/dracut/modules.d/50plymouth +%{_datadir}/dracut/modules.d/60xen %{_datadir}/dracut/modules.d/90crypt %{_datadir}/dracut/modules.d/90dm %{_datadir}/dracut/modules.d/90dmraid @@ -184,6 +204,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/dracut/modules.d/95znet %{_datadir}/dracut/modules.d/95terminfo %{_datadir}/dracut/modules.d/95udev-rules +%{_datadir}/dracut/modules.d/95uswsusp %{_datadir}/dracut/modules.d/98syslog %{_datadir}/dracut/modules.d/99base %attr(0644,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log @@ -214,6 +235,8 @@ rm -rf $RPM_BUILD_ROOT %files tools %defattr(-,root,root,0755) %doc COPYING NEWS +%{_mandir}/man8/dracut-gencmdline.8* +%{_mandir}/man8/dracut-catimages.8* /sbin/dracut-gencmdline /sbin/dracut-catimages %dir /boot/dracut @@ -221,6 +244,15 @@ rm -rf $RPM_BUILD_ROOT %dir /var/lib/dracut/overlay %changelog +* Fri Jan 15 2010 Harald Hoyer 004-1 +- version 004 +- Resolves: rhbz#529339 rhbz#533494 rhbz#548550 +- Resolves: rhbz#548555 rhbz#553195 + +* Wed Jan 13 2010 Harald Hoyer 003-3 +- add Obsoletes of mkinitrd/nash/libbdevid-python +- Related: rhbz#543948 + * Wed Jan 13 2010 Warren Togami 003-2 - nbd is Fedora only diff --git a/sources b/sources index aa7d407..aeb36f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a71537e749186de2c6a97e0783b40d0 dracut-003.tar.bz2 +28a18c64b659be38567966aed84e7dc9 dracut-004.tar.bz2