X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=geninitrd.spec;h=2d22741469a88f0e01bace20620aa0c7ba3f3aa9;hb=240c97dd6a135009f4aaf5dd16f5f59a57aa592f;hp=cb7220efcefc98a0b0efcda10298ac14c929cdc5;hpb=56f5b59ef6d4ce95c1e8b6fc4c1458072306d1ab;p=packages%2Fgeninitrd.git

diff --git a/geninitrd.spec b/geninitrd.spec
index cb7220e..2d22741 100644
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -1,32 +1,52 @@
+# 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
-# leave rel 1 for ac
-Release:	3
+Version:	12744
+Release:	1
 License:	GPL
 Group:		Applications/System
 Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	dfe2c92f317aaf3b35b54aedaef0fd2a
-Patch0:		%{name}-ide.patch
+# Source0-md5:	062168175f568a8a27eb3f67f9225676
+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.00-0.rc3.2
+Requires:	busybox-initrd >= 1.22.1-2
 Requires:	coreutils
 Requires:	cpio
 Requires:	fileutils
-Requires:	genromfs
+Requires:	glibc-misc
 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:	rc-scripts >= 0.2.7
 Requires:	tar
+Requires:	virtual(module-tools)
+Suggests:	genromfs
+Suggests:	pciutils
 Obsoletes:	mkinitrd
-Conflicts:	udev-initrd < 1:104
+# 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
+%endif
+Conflicts:	kmod < 7-2
+Conflicts:	module-init-tools < 3.2.2-6
+Conflicts:	pciutils < 2.2.9
+Conflicts:	udev-initrd < 1:168
+Conflicts:	xz < 4.999.9
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -62,15 +82,15 @@ startu z initrd. Skrypt geninitrd generuje obraz ramdysku na podstawie
 bieżących informacji zawartych w /etc/modules.conf.
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -qc
+mv %{name}-%{version}*/* .
+#%patch0 -p1
 
 %build
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
@@ -82,8 +102,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc ChangeLog
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/geninitrd
 %attr(755,root,root) /sbin/geninitrd
-%{_mandir}/man8/*
+%{_mandir}/man8/geninitrd.8*
+
+%dir /lib/geninitrd
+/lib/geninitrd/functions
+/lib/geninitrd/mod-*.sh
+%attr(755,root,root) /lib/geninitrd/extract-ikconfig
 
-%dir %{_sysconfdir}/geninitrd
-%{_sysconfdir}/geninitrd/functions
-%{_sysconfdir}/geninitrd/mod-*.sh
+%dir /lib/geninitrd/udev-rules
+/lib/geninitrd/udev-rules/*.rules