X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=geninitrd.spec;h=6005d3dd3d9aeba05762c04f78437db16f145d98;hb=c93f3d5bd291ebe43b88afb384e2adb34264f91a;hp=018ea78fab0856e01a8246f1f83cdf665aa21408;hpb=b381e9d95ceffb3fe4f98700870b292ceb44cf7c;p=packages%2Fgeninitrd.git

diff --git a/geninitrd.spec b/geninitrd.spec
index 018ea78..6005d3d 100644
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -1,42 +1,51 @@
+# 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.20
-# leave rel 1 for ac
-Release:	2
+Version:	12736
+Release:	3
 License:	GPL
 Group:		Applications/System
 Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	de4e015717e7dc37417a6b687063a49f
-Patch0:		%{name}-romfs.patch
-Patch1:		%{name}-gzip-compressor.patch
+# Source0-md5:	54fef4e59386bac53e57822deffeef32
+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-4
+Requires:	busybox-initrd >= 1.22.1-2
 Requires:	coreutils
 Requires:	cpio
 Requires:	fileutils
-Requires:	genromfs
+Requires:	glibc-misc
 Requires:	gzip
-Requires:	/usr/bin/ldd
 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 automatically disabled in geninitrd
+Requires:	virtual(module-tools)
+Suggests:	genromfs
+Suggests:	pciutils
+Obsoletes:	mkinitrd
+# 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
-%endif
-Obsoletes:	mkinitrd
+Conflicts:	grubby < 5.0.4-3.1
+%else
 Conflicts:	grubby < 6.0.24-3
-Conflicts:	udev-initrd < 1:104
+%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)
@@ -73,18 +82,15 @@ startu z initrd. Skrypt geninitrd generuje obraz ramdysku na podstawie
 bieżących informacji zawartych w /etc/modules.conf.
 
 %prep
-%setup -q
-%if "%{pld_release}" == "ti"
+%setup -qc
+mv %{name}-%{version}*/* .
 %patch0 -p1
-%patch1 -p1
-%endif
 
 %build
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
@@ -101,3 +107,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir /lib/geninitrd
 /lib/geninitrd/functions
 /lib/geninitrd/mod-*.sh
+%attr(755,root,root) /lib/geninitrd/extract-ikconfig
+
+%dir /lib/geninitrd/udev-rules
+/lib/geninitrd/udev-rules/*.rules