X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=geninitrd.spec;h=c99bb759c5f3b806d5f7ef9357f25a062b11e235;hb=eb76cceeb71e66ebabe27e0088cb7871a9d1cf48;hp=aa13a115e77f1a0cb0bab2ec5814cf6b25361ea0;hpb=5bba2f6cdb82a0cc515d8e9ca4e03df8998c62a0;p=packages%2Fgeninitrd.git

diff --git a/geninitrd.spec b/geninitrd.spec
index aa13a11..c99bb75 100644
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -6,51 +6,47 @@
 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.33
-Release:	1
+Version:	12757
+Release:	2
 License:	GPL
 Group:		Applications/System
 Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	f302536aa529f794ce491af07f5703ac
-Patch0:		%{name}-romfs.patch
-Patch1:		%{name}-gzip-compressor.patch
-#Patch2:		%{name}-svn.patch
+# Source0-md5:	3fb153489c3c245e5c1ee4bbc333acb4
+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:	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)
+Requires:	xz
+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
-# 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:	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)
@@ -87,12 +83,9 @@ 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
-#%patch2 -p0
 
 %build
 %{__make}
@@ -116,3 +109,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