- rel 4; add ehci_platform; load xhci last

[packages/geninitrd.git] / geninitrd.spec

diff --git a/geninitrd.spec b/geninitrd.spec
index b4a8346040d4a966e3584bf7ee7c24e10674e641..d9c6d162cc75e0800b7a117b5b3d79c88a01c021 100644 (file)
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -6,41 +6,36 @@
 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.34
-Release:       2
+Version:       12639
+Release:       4
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: 87585c07b85afcd4f32239969673e0b2
-Patch0:                %{name}-romfs.patch
-Patch1:                %{name}-gzip-compressor.patch
-Patch2:                %{name}-svn.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-4
+Requires:      busybox-initrd >= 1.1.0
 Requires:      coreutils
 Requires:      cpio
 Requires:      fileutils
-Requires:      genromfs
 Requires:      glibc-misc
 Requires:      gzip
 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
+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
-%endif
+Suggests:      genromfs
+Suggests:      pciutils
 # suggest for blkid
 %if "%{pld_release}" != "ac"
 Suggests:      util-linux-initrd
@@ -51,7 +46,10 @@ 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)
@@ -89,11 +87,7 @@ bieżących informacji zawartych w /etc/modules.conf.
 
 %prep
 %setup -q
-%if "%{pld_release}" == "ti"
-%patch0 -p1
-%patch1 -p1
-%endif
-%patch2 -p0
+%patch0 -p0
 
 %build
 %{__make}
@@ -117,3 +111,6 @@ rm -rf $RPM_BUILD_ROOT
 /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