X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=geninitrd.spec;h=d45d8f83c686cc84af89e9aeb73de1036e1d1003;hb=f9045633655dbc1c8f7ffc6521cb8d0aa9733ba6;hp=3f9c462b7b6415f03a87f1143ecfd4dfacf3d3eb;hpb=cd4499946812c36d5fc65482981b92ba22f48f3a;p=packages%2Fgeninitrd.git

diff --git a/geninitrd.spec b/geninitrd.spec
index 3f9c462..d45d8f8 100644
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -6,21 +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:	12582
-Release:	2
+Version:	12757
+Release:	4
 License:	GPL
 Group:		Applications/System
 Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	1761d2097523b5c248c5846ebd3685d3
-Patch0:		%{name}-romfs.patch
-Patch1:		%{name}-gzip-compressor.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
+# Source0-md5:	3fb153489c3c245e5c1ee4bbc333acb4
+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-implementation >= 1.22.1-2
 Requires:	coreutils
 Requires:	cpio
 Requires:	fileutils
@@ -32,23 +29,16 @@ Requires:	pci-database >= 0.4
 Requires:	rc-scripts >= 0.2.7
 Requires:	tar
 Requires:	virtual(module-tools)
-%if "%{pld_release}" == "ti"
-Requires:	lvm2-initrd
-Requires:	mdadm-initrd >= 1.12.0-1
-%else
-# 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
+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
@@ -93,12 +83,9 @@ 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"
+%setup -qc
+mv %{name}-%{version}*/* .
 %patch0 -p1
-%patch1 -p1
-%endif
-%patch2 -p0
 
 %build
 %{__make}