- version 003

.cvsignore

@@ -1 +1 @@
-dracut-002-44a6a0d9.tar.bz2
+dracut-003.tar.bz2

dracut.spec

@@ -1,4 +1,3 @@
-%define gittag 44a6a0d9
 %define with_switch_root 1
 
 %if 0%{?fedora} > 11
@@ -17,12 +16,14 @@
 %endif
 
 Name: dracut
-Version: 002
+Version: 003
-Release: 25%{?rdist}
+Release: 1%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
 URL: http://apps.sourceforge.net/trac/dracut/wiki
+# Source can be generated by 
+# 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)
 Requires: udev
@@ -78,7 +79,12 @@ all purpose initramfs with network support with dracut.
 Summary: dracut modules to build a dracut initramfs with an integrity check.
 Requires: %{name} = %{version}-%{release}
 Requires: hmaccalc
+%if 0%{?rhel} > 5
+# For Alpha 3, we want nss instead of nss-softokn
+Requires: nss
+%else
 Requires: nss-softokn
+%endif
 Requires: nss-softokn-freebl
 
 %description fips
@@ -122,18 +128,15 @@ This package contains tools to assemble the local initrd and host configuration.
 %setup -q -n %{name}-%{version}%{?dashgittag}
 
 %build
-make
+make WITH_SWITCH_ROOT=0%{?with_switch_root}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin \
-     sysconfdir=/etc mandir=%{_mandir}
+     sysconfdir=/etc mandir=%{_mandir} WITH_SWITCH_ROOT=0%{?with_switch_root}
 
 echo %{name}-%{version}-%{release} > $RPM_BUILD_ROOT/%{_datadir}/dracut/modules.d/10rpmversion/dracut-version
-
+rm $RPM_BUILD_ROOT/%{_datadir}/dracut/modules.d/01fips/check
-%if ! 0%{?with_switch_root}
-rm -f $RPM_BUILD_ROOT/sbin/switch_root
-%endif
 
 mkdir -p $RPM_BUILD_ROOT/boot/dracut
 mkdir -p $RPM_BUILD_ROOT/var/lib/dracut/overlay
@@ -154,6 +157,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dracut/dracut-functions
 %config(noreplace) /etc/dracut.conf
 %{_mandir}/man8/dracut.8*
+%{_mandir}/man5/dracut.conf.5*
 %{_datadir}/dracut/modules.d/00dash
 %{_datadir}/dracut/modules.d/10redhat-i18n
 %{_datadir}/dracut/modules.d/10rpmversion
@@ -175,7 +179,6 @@ 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/95udev-rules.ub810
 %{_datadir}/dracut/modules.d/98syslog
 %{_datadir}/dracut/modules.d/99base
 %attr(0644,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log
@@ -213,6 +216,17 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Fri Nov 27 2009 Harald Hoyer <harald@redhat.com> 003-1
+- version 003
+
+* Mon Nov 23 2009 Harald Hoyer <harald@redhat.com> 002-26
+- add WITH_SWITCH_ROOT make flag
+- add fips requirement conditional
+- add more device mapper modules (bug #539656)
+
+* Fri Nov 20 2009 Dennis Gregorovic <dgregor@redhat.com> - 002-25.1
+- nss changes for Alpha 3
+
 * Thu Nov 19 2009 Harald Hoyer <harald@redhat.com> 002-25
 - add more requirements for dracut-fips (bug #539257)
 

sources

@@ -1 +1 @@
-da93a77876d784b188a319922e5426fd  dracut-002-44a6a0d9.tar.bz2
+6a71537e749186de2c6a97e0783b40d0  dracut-003.tar.bz2