X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=geninitrd.spec;h=7171beed776b104c63342058c496081fc180d725;hb=fa3052040ae8124da1503cc8d14d282196ee16bd;hp=dc4b186955afcbc571192497106f87c85636bb0f;hpb=8d4b3be53435e74b2b2e1259df4e8aa3d8a8dad2;p=packages%2Fgeninitrd.git

diff --git a/geninitrd.spec b/geninitrd.spec
index dc4b186..7171bee 100644
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -6,18 +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:	10000.20
+Version:	10000.32
 # leave rel 1 for ac
-Release:	5
+Release:	6
 License:	GPL
 Group:		Applications/System
 Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	de4e015717e7dc37417a6b687063a49f
+# Source0-md5:	9d75e347ff49312209e97ead93378f4a
 Patch0:		%{name}-romfs.patch
 Patch1:		%{name}-gzip-compressor.patch
-Patch2:		%{name}-scsi_sync_scan.patch
-Patch3:		%{name}-tuxonice_on_dm.patch
-Patch4:		%{name}-mdadm.patch
+Patch2:		%{name}-svn.patch
 BuildRequires:	xmlto >= 0:0.0.18-1
 Requires:	/usr/bin/ldd
 Requires:	awk
@@ -37,11 +35,15 @@ Requires:	tar
 Requires:	lvm2-initrd
 Requires:	mdadm-initrd >= 1.12.0-1
 %else
-# otherwise LVM subsystem is automatically disabled in geninitrd
+# 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
+# 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
@@ -91,8 +93,6 @@ bieżących informacji zawartych w /etc/modules.conf.
 %patch1 -p1
 %endif
 %patch2 -p0
-%patch3 -p1
-%patch4 -p0
 
 %build
 %{__make}
@@ -116,3 +116,4 @@ rm -rf $RPM_BUILD_ROOT
 %dir /lib/geninitrd
 /lib/geninitrd/functions
 /lib/geninitrd/mod-*.sh
+%attr(755,root,root) /lib/geninitrd/extract-ikconfig