- generic fixes that are needed to build e2fsprogs with dietlibc

[packages/e2fsprogs.git] / e2fsprogs.spec

diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index fd777cbc71c0542ead91be61889b4ccea4774974..ee101daccf25cc1fd1e09d1e46692f6bc183387b 100644 (file)
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -34,12 +34,12 @@ Summary(uk.UTF-8):  Утиліти для роботи з файловою сис
 Summary(zh_CN.UTF-8):  管理第二扩展（ext2）文件系统的工具。
 Summary(zh_TW.UTF-8):  用於管理 ext2 檔案系統的工具程式。
 Name:          e2fsprogs
-Version:       1.41.0
-Release:       1
+Version:       1.41.3
+Release:       3
 License:       GPL v2 (with LGPL v2 and BSD parts)
 Group:         Applications/System
 Source0:       http://dl.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz
-# Source0-md5: 83144fa7e0e63647f920b77650ea1836
+# Source0-md5: b21d26fc46c584021dc9c444933ee1c2
 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
@@ -47,16 +47,13 @@ Source2:    http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-ma
 Patch0:                %{name}-info.patch
 Patch1:                e2compr-info.patch
 Patch2:                %{name}-498381.patch
-Patch3:                %{name}-pl.po-update.patch
 URL:           http://e2fsprogs.sourceforge.net/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
 BuildRequires: automake
-BuildRequires: device-mapper-devel >= 1.02.18-2
 BuildRequires: gettext-devel >= 0.11
 BuildRequires: rpmbuild(macros) >= 1.426
 BuildRequires: texinfo
 %if %{with allstatic}
-BuildRequires: device-mapper-static
 BuildRequires: glibc-static
 BuildRequires: libselinux-static
 BuildRequires: libsepol-static
@@ -604,7 +601,6 @@ etykietę lub UUID - statycznie skonsolidowane na potrzeby initrd.
 %{__gzip} -dc < %{SOURCE1} > doc/e2compr.texinfo
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 sed -i -e '/AC_SUBST(DO_TEST_SUITE/a\MKINSTALLDIRS="install -d"\nAC_SUBST(MKINSTALLDIRS)\n' configure.in
 
@@ -627,7 +623,7 @@ cp -f /usr/share/automake/config.sub .
        --disable-selinux \
        --disable-nls
 
-%{__make} libs
+%{__make} -j1 libs
 %{__make} progs
 mv -f misc/blkid initrd-blkid
 %{__make} clean
@@ -637,7 +633,6 @@ mv -f misc/blkid initrd-blkid
        --with-root-prefix="" \
        %{!?with_nls:--disable-nls} \
        %{!?with_allstatic:--enable-elf-shlibs} \
-       --enable-blkid-devmapper \
        --enable-compression \
        --enable-htree \
        --enable-fsck \
@@ -674,7 +669,7 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/e2fsck.conf
 
 bzip2 -dc %{SOURCE2} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
-rm -f $RPM_BUILD_ROOT%{_mandir}/man8/{mkfs,fsck}.ext[23].8*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man8/{mkfs,fsck}.ext[234]*.8*
 echo '.so e2fsck.8' > $RPM_BUILD_ROOT%{_mandir}/man8/fsck.ext2.8
 echo '.so e2fsck.8' > $RPM_BUILD_ROOT%{_mandir}/man8/fsck.ext3.8
 echo '.so e2fsck.8' > $RPM_BUILD_ROOT%{_mandir}/man8/fsck.ext4.8
@@ -745,7 +740,7 @@ rm -rf $RPM_BUILD_ROOT
 %postun        -n libuuid -p /sbin/ldconfig
 
 %pre   -n uuidd
-if [ "$(getgid libuuid)" = "222" ]; then
+if [ "$(getgid libuuid 2>/dev/null)" = "222" ]; then
        /usr/sbin/groupmod -n uuidd libuuid
 fi
 %groupadd -g 222 uuidd