up to 12749 (x32 fixes)

[packages/geninitrd.git] / geninitrd.spec

diff --git a/geninitrd.spec b/geninitrd.spec
index d9ad597dd3c36342551c6c9797014c604c299006..8e868e9ba60cc318e4a1b8ade2aa6cc0a65a7bb3 100644 (file)
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -1,36 +1,53 @@
+# 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.16
-# leave rel 1 for ac
-Release:       2
+Version:       12749
+Release:       1
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: cad57ac6e42f0f8d4868ddef2f062680
-Patch0:                %{name}-romfs.patch
+# Source0-md5: f26733e51d545d71feff72c16abf1f6b
+Patch0:                %{name}-git.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-0.rc3.2
+Requires:      busybox-initrd >= 1.22.1-2
 Requires:      coreutils
 Requires:      cpio
 Requires:      fileutils
-Requires:      genromfs
+Requires:      glibc-misc
 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
 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
+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
+Conflicts:     grubby < 5.0.4-3.1
+%else
 Conflicts:     grubby < 6.0.24-3
-Conflicts:     udev-initrd < 1:104
+%endif
+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)
 
@@ -66,17 +83,15 @@ startu z initrd. Skrypt geninitrd generuje obraz ramdysku na podstawie
 bieżących informacji zawartych w /etc/modules.conf.
 
 %prep
-%setup -q
-%if "%{pld_release}" == "ti"
-%patch0 -p1
-%endif
+%setup -qc
+mv %{name}-%{version}*/* .
+#%patch0 -p1
 
 %build
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
@@ -93,3 +108,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir /lib/geninitrd
 /lib/geninitrd/functions
 /lib/geninitrd/mod-*.sh
+%attr(755,root,root) /lib/geninitrd/extract-ikconfig
+
+%dir /lib/geninitrd/udev-rules
+/lib/geninitrd/udev-rules/*.rules