From 2c1bd61a1269dfa6fa86a16c72b4ab9668df5d85 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Sat, 25 Jun 2011 20:06:12 +0000
Subject: [PATCH] - fixes for without dietlibc

Changed files:
    e2fsprogs.spec -> 1.236
---
 e2fsprogs.spec | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index bab196a..4938a87 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -72,6 +72,8 @@ BuildRequires:	libblkid-dietlibc
 BuildRequires:	libuuid-dietlibc
 		%else
 BuildRequires:	glibc-static
+BuildRequires:	libblkid-static
+BuildRequires:	libuuid-static
 		%endif
 	%endif
 %endif
@@ -573,8 +575,8 @@ Group:		Base
 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
@@ -612,8 +614,12 @@ sed -i -e 's|\(^LIBUUID = .*\)|\1 -lcompat|g' \
 	%{?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 \
-- 
2.43.0