X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=geninitrd.spec;h=1ef21ae85a7cf79e269cb86e5445f319537ad5e1;hb=fd9645f0f958d4a99ee321105864799cf6a1dc3e;hp=b62288a6d4263a6a529fced729125bd7351d6259;hpb=1f24d1e3c111ede2e3bd514d176c5ef6d7459595;p=packages%2Fgeninitrd.git

diff --git a/geninitrd.spec b/geninitrd.spec
index b62288a..1ef21ae 100644
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -1,34 +1,58 @@
+# 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.13
-# leave rel 1 for ac
+Version:	12385
 Release:	2
 License:	GPL
 Group:		Applications/System
 Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	06481d31f193746e30d4fba986b24434
+# Source0-md5:	8dee910b40e5505c4ee3e71f4d2e042a
 Patch0:		%{name}-romfs.patch
+Patch1:		%{name}-gzip-compressor.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
 Requires:	awk
-Requires:	busybox-initrd >= 1.00-0.rc3.2
+Requires:	busybox-initrd >= 1.1.0
 Requires:	coreutils
 Requires:	cpio
 Requires:	fileutils
 Requires:	genromfs
+Requires:	glibc-misc
 Requires:	gzip
-Requires:	/usr/bin/ldd
-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
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -67,14 +91,15 @@ bieżących informacji zawartych w /etc/modules.conf.
 %setup -q
 %if "%{pld_release}" == "ti"
 %patch0 -p1
+%patch1 -p1
 %endif
+%patch2 -p0
 
 %build
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
@@ -91,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