packages: dracut/dracut.spec - general spec cleanup

[baggins]

Author: baggins                      Date: Wed Mar 21 11:46:36 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- general spec cleanup

---- Files affected:
packages/dracut:
   dracut.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/dracut/dracut.spec
diff -u packages/dracut/dracut.spec:1.2 packages/dracut/dracut.spec:1.3
--- packages/dracut/dracut.spec:1.2	Wed Mar 21 12:21:50 2012
+++ packages/dracut/dracut.spec	Wed Mar 21 12:46:31 2012
@@ -8,13 +8,8 @@
 Source0:	ftp://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
 # Source0-md5:	8c966954cd973b5abbd7193368f1d5cc
 URL:		https://dracut.wiki.kernel.org/
-BuildRequires:	bash
-BuildRequires:	dash
-BuildRequires:	docbook-dtds
 BuildRequires:	docbook-style-xsl
-BuildRequires:	git
-BuildRequires:	libxslt
-#BuildRequires:	systemd-units
+BuildRequires:	libxslt-progs
 Requires:	bash
 Requires:	coreutils
 Requires:	cpio
@@ -25,8 +20,10 @@
 Requires:	hardlink
 Requires:	module-init-tools >= 3.7-9
 Requires:	sed
+Requires:	systemd-units
 Requires:	udev
 Requires:	util-linux >= 2.20
+Suggests:	dash
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -100,12 +97,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/boot/dracut
-install -d $RPM_BUILD_ROOT/var/lib/dracut/overlay
-install -d $RPM_BUILD_ROOT%{_localstatedir}/log
-install -d $RPM_BUILD_ROOT%{_sharedstatedir}/initramfs
-install -d $RPM_BUILD_ROOT/etc/logrotate.d
-install -d $RPM_BUILD_ROOT/sbin
+install -d $RPM_BUILD_ROOT{/boot/dracut,/etc/logrotate.d,/sbin} \
+	$RPM_BUILD_ROOT/var/{log,lib/{dracut/overlay,initramfs}}
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT \
 	libdir=%{_prefix}/lib \
@@ -116,46 +109,37 @@
 
 echo %{name}-%{version}-%{release} > $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/10rpmversion/dracut-version
 
-# remove gentoo specific modules
-rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/50gensplash
-
-touch $RPM_BUILD_ROOT%{_localstatedir}/log/dracut.log
-
-#install dracut.conf.d/fedora.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d/01-dist.conf
-install dracut.conf.d/fips.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d/40-fips.conf
-
-#rm $RPM_BUILD_ROOT%{_bindir}/mkinitrd
-#rm $RPM_BUILD_ROOT%{_bindir}/lsinitrd
-
-install dracut.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/dracut_log
+#install -p dracut.conf.d/fedora.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d/01-dist.conf
+install -p dracut.conf.d/fips.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d/40-fips.conf
+install -p dracut.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/dracut_log
 
 # create compat symlink
 ln -s %{_bindir}/dracut $RPM_BUILD_ROOT/sbin/dracut
 
+# remove gentoo specific modules
+%{__rm} $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/50gensplash
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %doc README HACKING TODO COPYING AUTHORS NEWS dracut.html dracut.png dracut.svg
-%attr(755,root,root) %{_bindir}/dracut
+%dir %{_sysconfdir}/dracut.conf.d
+%config(noreplace) %{_sysconfdir}/dracut.conf
+#%config %{_sysconfdir}/dracut.conf.d/01-dist.conf
+%config(noreplace) /etc/logrotate.d/dracut_log
 # compat symlink
-/sbin/dracut
-#%attr(755,root,root) %{_bindir}/mkinitrd
-#%attr(755,root,root) %{_bindir}/lsinitrd
+%attr(755,root,root) /sbin/dracut
+%attr(755,root,root) %{_bindir}/dracut
+%attr(755,root,root) %{_bindir}/mkinitrd
+%attr(755,root,root) %{_bindir}/lsinitrd
 %dir %{dracutlibdir}
 %dir %{dracutlibdir}/modules.d
 %{dracutlibdir}/dracut-functions.sh
 %{dracutlibdir}/dracut-functions
 %{dracutlibdir}/dracut-logger.sh
 %{dracutlibdir}/dracut-initramfs-restore
-%config(noreplace) %{_sysconfdir}/dracut.conf
-#%config %{_sysconfdir}/dracut.conf.d/01-dist.conf
-%dir %{_sysconfdir}/dracut.conf.d
-%{_mandir}/man8/dracut.8*
-%{_mandir}/man7/dracut.kernel.7*
-%{_mandir}/man7/dracut.cmdline.7*
-%{_mandir}/man5/dracut.conf.5*
 %{dracutlibdir}/modules.d/00bootchart
 %{dracutlibdir}/modules.d/00dash
 %{dracutlibdir}/modules.d/05busybox
@@ -196,11 +180,13 @@
 %{dracutlibdir}/modules.d/99fs-lib
 %{dracutlibdir}/modules.d/99img-lib
 %{dracutlibdir}/modules.d/99shutdown
-%config(noreplace) /etc/logrotate.d/dracut_log
-%ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log
-%dir %{_sharedstatedir}/initramfs
+%dir /var/lib/initramfs
 %{systemdunitdir}/*.service
 %{systemdunitdir}/*/*.service
+%{_mandir}/man8/dracut.8*
+%{_mandir}/man7/dracut.kernel.7*
+%{_mandir}/man7/dracut.cmdline.7*
+%{_mandir}/man5/dracut.conf.5*
 
 %files network
 %defattr(644,root,root,755)
@@ -244,6 +230,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2012/03/21 11:46:31  baggins
+- general spec cleanup
+
 Revision 1.2  2012/03/21 11:21:50  baggins
 - working URL
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org//packages/dracut/dracut.spec?r1=1.2&r2=1.3&f=u