- up to 10000.17

[packages/geninitrd.git] / geninitrd.spec

diff --git a/geninitrd.spec b/geninitrd.spec
index ba1b050fa0243e93d0836aa920939d3aa5c11fd3..d9eef327ead35fe5cad2f332c60840fd77a93bb1 100644 (file)
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -1,19 +1,25 @@
 Summary:       Creates an initial ramdisk image for preloading modules
 Summary(pl.UTF-8):     Narzędzie do tworzenia inicjalnego ramdysku używanego przy starcie systemu
 Name:          geninitrd
-Version:       9000.14
-Release:       1
+Version:       10000.17
+# leave rel 1 for ac
+Release:       2
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: 80b817efc3a260602d24e0886464a006
+# Source0-md5: 32e13caac30acb12c936d6b73f4d9707
+Patch0:                %{name}-romfs.patch
 BuildRequires: xmlto >= 0:0.0.18-1
 Requires:      awk
 Requires:      busybox-initrd >= 1.00-0.rc3.2
+Requires:      coreutils
 Requires:      cpio
 Requires:      fileutils
 Requires:      genromfs
 Requires:      gzip
+Requires:      /usr/bin/ldd
+# otherwise lvm subsystem is automaticly disabled in geninitrd
+Requires:      lvm2-initrd
 Requires:      rc-scripts >= 0.2.7
 # without this softraid installations of PLD fail
 Requires:      mdadm-initrd >= 1.12.0-1
@@ -21,9 +27,9 @@ Requires:     mktemp >= 1.5-8
 Requires:      module-init-tools >= 3.2.2-6
 Requires:      mount
 Requires:      pci-database >= 0.4
-Requires:      sh-utils
 Requires:      tar
 Obsoletes:     mkinitrd
+Conflicts:     grubby < 6.0.24-3
 Conflicts:     udev-initrd < 1:104
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -61,6 +67,9 @@ bieżących informacji zawartych w /etc/modules.conf.
 
 %prep
 %setup -q
+%if "%{pld_release}" == "ti"
+%patch0 -p1
+%endif
 
 %build
 %{__make}
@@ -77,8 +86,10 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog
-%attr(755,root,root) /sbin/geninitrd
-%dir %{_sysconfdir}/geninitrd
-%{_sysconfdir}/geninitrd/functions
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/geninitrd
-%{_mandir}/man8/*
+%attr(755,root,root) /sbin/geninitrd
+%{_mandir}/man8/geninitrd.8*
+
+%dir /lib/geninitrd
+/lib/geninitrd/functions
+/lib/geninitrd/mod-*.sh