packages: e2fsprogs/e2fsprogs.spec - BR libblkid-{devel, dietlibc} - hack ar...

[baggins]

Author: baggins                      Date: Wed May 20 13:46:30 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- BR libblkid-{devel,dietlibc}
- hack around chicken-egg problem with libblkid and libuuid

---- Files affected:
packages/e2fsprogs:
   e2fsprogs.spec (1.211 -> 1.212) 

---- Diffs:

================================================================
Index: packages/e2fsprogs/e2fsprogs.spec
diff -u packages/e2fsprogs/e2fsprogs.spec:1.211 packages/e2fsprogs/e2fsprogs.spec:1.212
--- packages/e2fsprogs/e2fsprogs.spec:1.211	Tue May 19 20:54:39 2009
+++ packages/e2fsprogs/e2fsprogs.spec	Wed May 20 15:46:24 2009
@@ -50,13 +50,14 @@
 Patch1:		e2compr-info.patch
 Patch2:		%{name}-498381.patch
 Patch3:		%{name}-diet.patch
+Patch4:		%{name}-external-libblkid.patch
 URL:		http://e2fsprogs.sourceforge.net/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	gettext-devel >= 0.11
 BuildRequires:	rpmbuild(macros) >= 1.426
 BuildRequires:	texinfo
-BuildRequires:	util-linux-ng-devel >= 2.15-3
+BuildRequires:	libblkid-devel
 %if %{with allstatic}
 BuildRequires:	glibc-static
 BuildRequires:	libselinux-static
@@ -68,6 +69,7 @@
 	%else
 		%if %{with dietlibc}
 BuildRequires:	dietlibc-static
+BuildRequires:	libblkid-dietlibc
 		%else
 BuildRequires:	glibc-static
 		%endif
@@ -633,6 +635,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 sed -i -e '/AC_SUBST(DO_TEST_SUITE/a\MKINSTALLDIRS="install -d"\nAC_SUBST(MKINSTALLDIRS)\n' configure.in
 
@@ -1077,6 +1080,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.212  2009/05/20 13:46:24  baggins
+- BR libblkid-{devel,dietlibc}
+- hack around chicken-egg problem with libblkid and libuuid
+
 Revision 1.211  2009/05/19 18:54:39  baggins
 - findfs gone with blkid
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/e2fsprogs/e2fsprogs.spec?r1=1.211&r2=1.212&f=u