- up to 12639; fixes few more /dev/ permissions

[packages/geninitrd.git] / geninitrd.spec

diff --git a/geninitrd.spec b/geninitrd.spec
index 2b9459ef326063247d1c1f2807c837e2940f216e..75f1d783e129f4bd1d92cf80200db3559cd8bcdc 100644 (file)
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -6,15 +6,16 @@
 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:       2
+Version:       12639
+Release:       1
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: 7bab5ccd79af683dd3162f660e552332
+# Source0-md5: bd47ea3ca6dbeea39af6bc5eb1d12e5a
 Patch0:                %{name}-romfs.patch
 Patch1:                %{name}-gzip-compressor.patch
-#Patch2:       %{name}-svn.patch
+# svn diff http://svn.pld-linux.org/svn/geninitrd/trunk -r 12585:HEAD > geninitrd-svn.patch
+Patch2:                %{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
@@ -52,7 +53,9 @@ Conflicts:    grubby < 5.0.4-3.1
 %else
 Conflicts:     grubby < 6.0.24-3
 %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