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

diff --git a/geninitrd.spec b/geninitrd.spec
index bca9db0..7171bee 100644
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -1,36 +1,55 @@
+### TODO:
+# - BUG: you can't set in /etc/mdadm.conf:
+#  DEVICE partitions containers
+#  (which is default BTW if none set). Generation of initrd will fail
+#
 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.18
+Version:	10000.32
 # leave rel 1 for ac
-Release:	5
+Release:	6
 License:	GPL
 Group:		Applications/System
 Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	b3b0acb344ae8852cf30672370c81888
+# Source0-md5:	9d75e347ff49312209e97ead93378f4a
 Patch0:		%{name}-romfs.patch
-Patch1:		%{name}-lzma.patch
+Patch1:		%{name}-gzip-compressor.patch
+Patch2:		%{name}-svn.patch
 BuildRequires:	xmlto >= 0:0.0.18-1
+Requires:	/usr/bin/ldd
 Requires:	awk
-Requires:	busybox-initrd >= 1.00-0.rc3.2
+Requires:	busybox-initrd > 1.00-4
 Requires:	coreutils
 Requires:	cpio
 Requires:	fileutils
 Requires:	genromfs
 Requires:	gzip
-Requires:	/usr/bin/ldd
-# otherwise lvm subsystem is automaticly disabled in geninitrd
-Requires:	lvm2-initrd
-Requires:	rc-scripts >= 0.2.7
-# without this softraid installations of PLD fail
-Requires:	mdadm-initrd >= 1.12.0-1
 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
+# 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
+%else
 Conflicts:	grubby < 6.0.24-3
+%endif
 Conflicts:	udev-initrd < 1:104
 Conflicts:	xz < 4.999.9
 BuildArch:	noarch
@@ -71,8 +90,9 @@ bieżących informacji zawartych w /etc/modules.conf.
 %setup -q
 %if "%{pld_release}" == "ti"
 %patch0 -p1
+%patch1 -p1
 %endif
-%patch1 -p0
+%patch2 -p0
 
 %build
 %{__make}
@@ -96,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