- rel 2; libdir brokeness fixed

[packages/geninitrd.git] / geninitrd.spec

diff --git a/geninitrd.spec b/geninitrd.spec
index 5ce63a29c5649c62cba55cd2f878df17ecb59170..6f33fbfe0023a902343fbeb58b67d047469bec16 100644 (file)
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -6,19 +6,18 @@
 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:       12695
+Version:       12749
 Release:       2
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: c6235c690934c87e5361bcf4a23b25db
-# svn diff http://svn.pld-linux.org/svn/geninitrd/trunk -r 12709:HEAD > geninitrd-svn.patch
-Patch0:                %{name}-svn.patch
-URL:           http://svn.pld-linux.org/trac/svn/wiki/packages/geninitrd
+# 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.1.0
+Requires:      busybox-initrd >= 1.22.1-2
 Requires:      coreutils
 Requires:      cpio
 Requires:      fileutils
@@ -30,18 +29,16 @@ 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
+Requires:      xz
 Suggests:      genromfs
 Suggests:      pciutils
-# suggest for blkid
-%if "%{pld_release}" != "ac"
-Suggests:      util-linux-initrd
-%endif
 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
@@ -86,8 +83,9 @@ startu z initrd. Skrypt geninitrd generuje obraz ramdysku na podstawie
 bieżących informacji zawartych w /etc/modules.conf.
 
 %prep
-%setup -q
-%patch0 -p0
+%setup -qc
+mv %{name}-%{version}*/* .
+%patch0 -p1
 
 %build
 %{__make}