packages: geninitrd/geninitrd.spec - ac compatible

[glen]

Author: glen                         Date: Fri Feb  5 12:46:07 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- ac compatible

---- Files affected:
packages/geninitrd:
   geninitrd.spec (2.161 -> 2.162) 

---- Diffs:

================================================================
Index: packages/geninitrd/geninitrd.spec
diff -u packages/geninitrd/geninitrd.spec:2.161 packages/geninitrd/geninitrd.spec:2.162
--- packages/geninitrd/geninitrd.spec:2.161	Thu Jan 21 16:57:52 2010
+++ packages/geninitrd/geninitrd.spec	Fri Feb  5 13:46:01 2010
@@ -4,7 +4,7 @@
 Name:		geninitrd
 Version:	10000.20
 # leave rel 1 for ac
-Release:	2
+Release:	1
 License:	GPL
 Group:		Applications/System
 Source0:	%{name}-%{version}.tar.gz
@@ -12,6 +12,7 @@
 Patch0:		%{name}-romfs.patch
 Patch1:		%{name}-gzip-compressor.patch
 BuildRequires:	xmlto >= 0:0.0.18-1
+Requires:	/usr/bin/ldd
 Requires:	awk
 Requires:	busybox-initrd > 1.00-4
 Requires:	coreutils
@@ -19,7 +20,6 @@
 Requires:	fileutils
 Requires:	genromfs
 Requires:	gzip
-Requires:	/usr/bin/ldd
 Requires:	mktemp >= 1.5-8
 Requires:	module-init-tools >= 3.2.2-6
 Requires:	mount
@@ -36,7 +36,11 @@
 Suggests:	mdadm-initrd >= 1.12.0-1
 %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
@@ -109,6 +113,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 2.162  2010/02/05 12:46:01  glen
+- ac compatible
+
 Revision 2.161  2010/01/21 15:57:52  baggins
 - release 10000.20
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/geninitrd/geninitrd.spec?r1=2.161&r2=2.162&f=u