- rel 9; swsusp was breaking normal setups; fix that

[packages/geninitrd.git] / geninitrd.spec

diff --git a/geninitrd.spec b/geninitrd.spec
index 481ebc6ad51a8c230d3d941c7caf0dd5cedb7c45..66a0335e1a3173e8b1833579292d6efc69eb2f28 100644 (file)
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -1,59 +1,49 @@
-# 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:       12462
-Release:       3
+Version:       12787
+Release:       9
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: 7bab5ccd79af683dd3162f660e552332
-Patch0:                %{name}-romfs.patch
-Patch1:                %{name}-gzip-compressor.patch
-#Patch2:       %{name}-svn.patch
-URL:           http://svn.pld-linux.org/trac/svn/wiki/packages/geninitrd
+# Source0-md5: 35b12ef61ee1e29692d67afd94731697
+Patch0:                %{name}-git.patch
+Patch1:                %{name}-static-dev.patch
+Patch2:                %{name}-posix-sh.patch
+URL:           http://git.pld-linux.org/?p=projects/geninitrd.git
 BuildRequires: xmlto >= 0:0.0.18-1
 Requires:      /usr/bin/ldd
 Requires:      awk
-Requires:      busybox-initrd >= 1.1.0
+Requires:      busybox-implementation >= 1.30.0-1
 Requires:      coreutils
 Requires:      cpio
 Requires:      fileutils
 Requires:      glibc-misc
 Requires:      gzip
+Requires:      libgcc
 Requires:      mktemp >= 1.5-8
 Requires:      mount
 Requires:      pci-database >= 0.4
 Requires:      rc-scripts >= 0.2.7
 Requires:      tar
 Requires:      virtual(module-tools)
-%if "%{pld_release}" == "ti"
-Requires:      lvm2-initrd
-Requires:      mdadm-initrd >= 1.12.0-1
-%else
-# 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
+Requires:      xz
 Suggests:      genromfs
 Suggests:      pciutils
-# suggest for blkid
-%if "%{pld_release}" != "ac"
-Suggests:      util-linux-initrd
-%endif
 Obsoletes:     mkinitrd
+# suggest for blkid
 %if "%{pld_release}" == "ac"
+# 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
 Conflicts:     grubby < 5.0.4-3.1
 %else
 Conflicts:     grubby < 6.0.24-3
 %endif
-Conflicts:     kmod < 5-2
+Conflicts:     kmod < 7-2
 Conflicts:     module-init-tools < 3.2.2-6
+Conflicts:     pciutils < 2.2.9
 Conflicts:     udev-initrd < 1:168
 Conflicts:     xz < 4.999.9
 BuildArch:     noarch
@@ -92,11 +82,9 @@ bieżących informacji zawartych w /etc/modules.conf.
 
 %prep
 %setup -q
-%if "%{pld_release}" == "ti"
 %patch0 -p1
 %patch1 -p1
-%endif
-#%patch2 -p0
+%patch2 -p1
 
 %build
 %{__make}
@@ -118,6 +106,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %dir /lib/geninitrd
 /lib/geninitrd/functions
+/lib/geninitrd/functions.initrd
 /lib/geninitrd/mod-*.sh
 %attr(755,root,root) /lib/geninitrd/extract-ikconfig