X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=geninitrd.spec;h=d1012e69ad28c2568f0e061223115a02ef7a4f55;hb=02d6660e2ad1a1a6da65b4c4deb51f5f52629f9d;hp=7be789e20c981808b7c19fc35ed7052d1bbe7041;hpb=ded6617011080fe9367dc6e067d8575c79fb2511;p=packages%2Fgeninitrd.git

diff --git a/geninitrd.spec b/geninitrd.spec
index 7be789e..d1012e6 100644
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -1,30 +1,57 @@
+### 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:	9000.10
-Release:	2
+Version:	10000.32
+# leave rel 1 for ac
+Release:	5
 License:	GPL
 Group:		Applications/System
 Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	73a74e669bc3528d31ab1f79f39d91fd
+# Source0-md5:	9d75e347ff49312209e97ead93378f4a
+Patch0:		%{name}-romfs.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:	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:	sh-utils
+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)
 
@@ -61,6 +88,11 @@ bieżących informacji zawartych w /etc/modules.conf.
 
 %prep
 %setup -q
+%if "%{pld_release}" == "ti"
+%patch0 -p1
+%patch1 -p1
+%endif
+%patch2 -p0
 
 %build
 %{__make}
@@ -77,8 +109,11 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog
-%attr(755,root,root) /sbin/geninitrd
-%dir %{_sysconfdir}/geninitrd
-%{_sysconfdir}/geninitrd/functions
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/geninitrd
-%{_mandir}/man8/*
+%attr(755,root,root) /sbin/geninitrd
+%{_mandir}/man8/geninitrd.8*
+
+%dir /lib/geninitrd
+/lib/geninitrd/functions
+/lib/geninitrd/mod-*.sh
+%attr(755,root,root) /lib/geninitrd/extract-ikconfig