version 011

.gitignore

@@ -1 +1,2 @@
 /dracut-011-9b30d47.tar.bz2
+/dracut-011.tar.bz2

dracut.spec

@@ -1,4 +1,3 @@
-%define gittag 9b30d47
 # Variables must be defined
 %define with_nbd                1
 
@@ -7,17 +6,9 @@
 %define with_nbd 0
 %endif
 
-%if %{defined gittag}
-%define rdist .git%{gittag}%{?dist}
-%define dashgittag -%{gittag}
-%else
-%define rdist %{?dist}
-%endif
-
 Name: dracut
 Version: 011
-%define release_prefix 0.1%{?rdist}
+Release: 1
-Release: %{release_prefix}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora}
@@ -29,8 +20,9 @@ Group: System/Base
 License: GPLv2+
 URL: https://dracut.wiki.kernel.org/
 # Source can be generated by
-# http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%{?dashgittag};sf=tgz
+# http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%{version};sf=tgz
-Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}%{?dashgittag}.tar.bz2
+Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.bz2
+
 
 BuildArch: noarch
 BuildRequires: dash bash
@@ -163,7 +155,8 @@ Requires: %{name} = %{version}-%{release}
 This package contains tools to assemble the local initrd and host configuration.
 
 %prep
-%setup -q -n %{name}-%{version}%{?dashgittag}
+%setup -q -n %{name}-%{version}
+
 
 %build
 make
@@ -204,8 +197,8 @@ rm $RPM_BUILD_ROOT/sbin/mkinitrd
 rm $RPM_BUILD_ROOT/sbin/lsinitrd
 %endif
 
-mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d/dracut
+mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
-install -m 0644 dracut.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/dracut
+install -m 0644 dracut.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/dracut_log
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -227,7 +220,6 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/dracut.conf.d/01-dist.conf
 %endif
 %dir /etc/dracut.conf.d
-%config(noreplace) /etc/logrotate.d/dracut
 %{_mandir}/man8/dracut.8*
 %{_mandir}/man7/dracut.kernel.7*
 %{_mandir}/man5/dracut.conf.5*
@@ -261,8 +253,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dracut/modules.d/98selinux
 %{_datadir}/dracut/modules.d/98syslog
 %{_datadir}/dracut/modules.d/99base
-# logfile needs no logrotate, because it gets overwritten
+%{_datadir}/dracut/modules.d/99shutdown
-# for every dracut run
+%config(noreplace) /etc/logrotate.d/dracut_log
 %attr(0644,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log
 %dir %{_sharedstatedir}/initramfs
 
@@ -298,6 +290,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Mon Jul 18 2011 Harald Hoyer <harald@redhat.com> 011-1
+- version 011
+
 * Fri May 20 2011 Harald Hoyer <harald@redhat.com> 011-0.1%{?rdist}
 - git snapshot of pre-version 011
 

sources

@@ -1 +1 @@
-927a7872904858049cb8d2131655ebc1  dracut-011-9b30d47.tar.bz2
+52b399efcee701ddbb63f92f407c91f6  dracut-011.tar.bz2