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

[packages/geninitrd.git] / geninitrd.spec

diff --git a/geninitrd.spec b/geninitrd.spec
index 087a7ec3a41ec65c660c0814d4b80e5555dc85f2..66a0335e1a3173e8b1833579292d6efc69eb2f28 100644 (file)
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -1,49 +1,50 @@
 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
-# leave rel 1 for ac
-Release:       5
+Version:       12787
+Release:       9
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: de4e015717e7dc37417a6b687063a49f
-Patch0:                %{name}-romfs.patch
-Patch1:                %{name}-gzip-compressor.patch
-Patch2:                %{name}-scsi_sync_scan.patch
-Patch3:                %{name}-tuxonice_on_dm.patch
-Patch4:                %{name}-mdadm.patch
+# 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.00-4
+Requires:      busybox-implementation >= 1.30.0-1
 Requires:      coreutils
 Requires:      cpio
 Requires:      fileutils
-Requires:      genromfs
+Requires:      glibc-misc
 Requires:      gzip
+Requires:      libgcc
 Requires:      mktemp >= 1.5-8
-Requires:      module-init-tools >= 3.2.2-6
 Requires:      mount
 Requires:      pci-database >= 0.4
 Requires:      rc-scripts >= 0.2.7
 Requires:      tar
-%if "%{pld_release}" == "ti"
-Requires:      lvm2-initrd
-Requires:      mdadm-initrd >= 1.12.0-1
-%else
-# otherwise LVM subsystem is automatically disabled in geninitrd
+Requires:      virtual(module-tools)
+Requires:      xz
+Suggests:      genromfs
+Suggests:      pciutils
+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
-%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:     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
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -81,20 +82,15 @@ bieżących informacji zawartych w /etc/modules.conf.
 
 %prep
 %setup -q
-%if "%{pld_release}" == "ti"
 %patch0 -p1
 %patch1 -p1
-%endif
-%patch2 -p0
-%patch3 -p1
-%patch4 -p0
+%patch2 -p1
 
 %build
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
@@ -110,4 +106,9 @@ 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
+
+%dir /lib/geninitrd/udev-rules
+/lib/geninitrd/udev-rules/*.rules