- fixes for without dietlibc

[packages/e2fsprogs.git] / e2fsprogs.spec

diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 884b5b626aa491194689436094161f1e60014dab..4938a87e2c43be91aa1ebbea057ad720342ff296 100644 (file)
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -35,12 +35,12 @@ Summary(uk.UTF-8):  Утиліти для роботи з файловою сис
 Summary(zh_CN.UTF-8):  管理第二扩展（ext2）文件系统的工具。
 Summary(zh_TW.UTF-8):  用於管理 ext2 檔案系統的工具程式。
 Name:          e2fsprogs
-Version:       1.41.13
+Version:       1.41.14
 Release:       1
 License:       GPL v2 (with LGPL v2 and BSD parts)
 Group:         Applications/System
 Source0:       http://downloads.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz
-# Source0-md5: 7508a192c7a9471e2128424f4eafac1c
+# Source0-md5: 05f70470aea2ef7efbb0845b2b116720
 Source1:       e2compr-0.4.texinfo.gz
 # Source1-md5: c3c59ff37e49d8759abb1ef95a8d3abf
 Source2:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
@@ -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 \