packages: e2fsprogs/e2fsprogs.spec - fixes for without dietlibc

[glen]

Author: glen                         Date: Sat Jun 25 20:06:19 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixes for without dietlibc

---- Files affected:
packages/e2fsprogs:
   e2fsprogs.spec (1.235 -> 1.236) 

---- Diffs:

================================================================
Index: packages/e2fsprogs/e2fsprogs.spec
diff -u packages/e2fsprogs/e2fsprogs.spec:1.235 packages/e2fsprogs/e2fsprogs.spec:1.236
--- packages/e2fsprogs/e2fsprogs.spec:1.235	Fri Dec 31 14:42:32 2010
+++ packages/e2fsprogs/e2fsprogs.spec	Sat Jun 25 22:06:12 2011
@@ -73,6 +73,8 @@
 BuildRequires:	libuuid-dietlibc
 		%else
 BuildRequires:	glibc-static
+BuildRequires:	libblkid-static
+BuildRequires:	libuuid-static
 		%endif
 	%endif
 %endif
@@ -574,8 +576,8 @@
 Conflicts:	geninitrd < 10000.10
 
 %description initrd
-This package includes a e2fsck and mke2fs utilities staticaly
-linked for initrd.
+This package includes a e2fsck and mke2fs utilities staticaly linked
+for initrd.
 
 %description initrd -l pl.UTF-8
 Pakiet ten zawiera narzędzia e2fsck i mke2fs statycznie skonsolidowane
@@ -613,8 +615,12 @@
 	%{?with_dietlibc:CC="diet %{__cc}"} \
 	CFLAGS="%{rpmcflags} -Os" \
 	LDFLAGS="%{rpmldflags} -static" \
+%if %{with dietlibc}
 	LIBUUID_LIBADD="-lcompat" \
 	LIBBLKID_LIBADD="-luuid -lcompat" \
+%else
+	LIBBLKID_LIBADD="-luuid" \
+%endif
 	--disable-elf-shlibs \
 	--disable-fsck \
 	--disable-libblkid \
@@ -988,6 +994,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.236  2011/06/25 20:06:12  glen
+- fixes for without dietlibc
+
 Revision 1.235  2010/12/31 13:42:32  qboosh
 - updated to 1.41.14
 
================================================================

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