- rel 2; no negative reports

[packages/geninitrd.git] / geninitrd.spec

diff --git a/geninitrd.spec b/geninitrd.spec
index 018ea78fab0856e01a8246f1f83cdf665aa21408..104befdf05ab476f14fc20dfc5673c87380b5f9f 100644 (file)
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -1,16 +1,22 @@
+### TODO:
+# - BUG: you can't set in /etc/mdadm.conf:
+#  DEVICE partitions containers
+#  (which is default BTW if none set). Generation of initrd will fail
+#
 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:       10000.20
+Version:       10000.32
 # leave rel 1 for ac
 Release:       2
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: de4e015717e7dc37417a6b687063a49f
+# Source0-md5: 9d75e347ff49312209e97ead93378f4a
 Patch0:                %{name}-romfs.patch
 Patch1:                %{name}-gzip-compressor.patch
 BuildRequires: xmlto >= 0:0.0.18-1
+Requires:      /usr/bin/ldd
 Requires:      awk
 Requires:      busybox-initrd > 1.00-4
 Requires:      coreutils
@@ -18,7 +24,6 @@ Requires:     cpio
 Requires:      fileutils
 Requires:      genromfs
 Requires:      gzip
-Requires:      /usr/bin/ldd
 Requires:      mktemp >= 1.5-8
 Requires:      module-init-tools >= 3.2.2-6
 Requires:      mount
@@ -29,13 +34,21 @@ Requires:   tar
 Requires:      lvm2-initrd
 Requires:      mdadm-initrd >= 1.12.0-1
 %else
-# otherwise LVM subsystem is automatically disabled in geninitrd
+# otherwise LVM subsystem is not enabled in geninitrd
 Suggests:      lvm2-initrd
 # without this softraid installations of PLD fail
 Suggests:      mdadm-initrd >= 1.12.0-1
 %endif
+# suggest for blkid
+%if "%{pld_release}" != "ac"
+Suggests:      util-linux-initrd
+%endif
 Obsoletes:     mkinitrd
+%if "%{pld_release}" == "ac"
+Conflicts:     grubby < 5.0.4-3.1
+%else
 Conflicts:     grubby < 6.0.24-3
+%endif
 Conflicts:     udev-initrd < 1:104
 Conflicts:     xz < 4.999.9
 BuildArch:     noarch
@@ -101,3 +114,4 @@ rm -rf $RPM_BUILD_ROOT
 %dir /lib/geninitrd
 /lib/geninitrd/functions
 /lib/geninitrd/mod-*.sh
+%attr(755,root,root) /lib/geninitrd/extract-ikconfig