- rel 3; handle ehci-pci module

[packages/geninitrd.git] / geninitrd.spec

diff --git a/geninitrd.spec b/geninitrd.spec
index 6d3a09a92a689b8584213ca029aeabb7e74ec4a7..e5b6440ed8af322a4cf4e969eb00e3ef033fa3b4 100644 (file)
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -1,34 +1,56 @@
+# 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.14
-# leave rel 1 for ac
-Release:       2
+Version:       12639
+Release:       3
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: db19e478687a747194e0b6532dbda924
-Patch0:                %{name}-romfs.patch
+# Source0-md5: bd47ea3ca6dbeea39af6bc5eb1d12e5a
+# svn diff http://svn.pld-linux.org/svn/geninitrd/trunk -r 12652:HEAD > geninitrd-svn.patch
+Patch0:                %{name}-svn.patch
+URL:           http://svn.pld-linux.org/trac/svn/wiki/packages/geninitrd
 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.1.0
 Requires:      coreutils
 Requires:      cpio
 Requires:      fileutils
-Requires:      genromfs
+Requires:      glibc-misc
 Requires:      gzip
-Requires:      /usr/bin/ldd
-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)
+# 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
+Suggests:      genromfs
+Suggests:      pciutils
+# 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
-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)
 
@@ -65,16 +87,13 @@ bieżących informacji zawartych w /etc/modules.conf.
 
 %prep
 %setup -q
-%if "%{pld_release}" == "ti"
-%patch0 -p1
-%endif
+%patch0 -p0
 
 %build
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
@@ -91,3 +110,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