X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=geninitrd.spec;h=04052310d359c282334c85cee10c58761070655a;hb=35f98152f62b0aeae2fb224820d1da3ae0f68a65;hp=07ff0bd174c2bbfb372c3d885270c964f9330a54;hpb=d174cb310633b39b7c199af51f8078c39eba72a1;p=packages%2Fgeninitrd.git

diff --git a/geninitrd.spec b/geninitrd.spec
index 07ff0bd..0405231 100644
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -6,15 +6,14 @@
 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:	12385
-Release:	4
+Version:	12639
+Release:	1
 License:	GPL
 Group:		Applications/System
 Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	8dee910b40e5505c4ee3e71f4d2e042a
-Patch0:		%{name}-romfs.patch
-Patch1:		%{name}-gzip-compressor.patch
-Patch2:		%{name}-svn.patch
+# Source0-md5:	bd47ea3ca6dbeea39af6bc5eb1d12e5a
+# svn diff http://svn.pld-linux.org/svn/geninitrd/trunk -r 12639:HEAD > geninitrd-svn.patch
+Patch0:		%{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
@@ -23,24 +22,20 @@ Requires:	busybox-initrd >= 1.1.0
 Requires:	coreutils
 Requires:	cpio
 Requires:	fileutils
-Requires:	genromfs
 Requires:	glibc-misc
 Requires:	gzip
 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
+Requires:	virtual(module-tools)
 # 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
+Suggests:	genromfs
+Suggests:	pciutils
 # suggest for blkid
 %if "%{pld_release}" != "ac"
 Suggests:	util-linux-initrd
@@ -51,7 +46,10 @@ Conflicts:	grubby < 5.0.4-3.1
 %else
 Conflicts:	grubby < 6.0.24-3
 %endif
-Conflicts:	udev-initrd < 1:104
+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)
@@ -89,11 +87,7 @@ bieżących informacji zawartych w /etc/modules.conf.
 
 %prep
 %setup -q
-%if "%{pld_release}" == "ti"
-%patch0 -p1
-%patch1 -p1
-%endif
-%patch2 -p0
+#%patch0 -p0
 
 %build
 %{__make}
@@ -117,3 +111,6 @@ rm -rf $RPM_BUILD_ROOT
 /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