- updated to 1.34

Changed files:
    e2fsprogs.spec -> 1.112

diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 5485d5f0900ff6b0371001a28d42f2127b8317f6..09947f9c7b639a5edb6c6001ae713af813c1a039 100644 (file)
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -27,23 +27,20 @@ Summary(uk):        
 Summary(zh_CN):        ¹ÜÀíµÚ¶þÀ©Õ¹£¨ext2£©ÎļþϵͳµÄ¹¤¾ß¡£
 Summary(zh_TW):        ¥Î©óºÞ²z ext2 Àɮרt²Îªº¤u¨ãµ{¦¡¡C
 Name:          e2fsprogs
-Version:       1.33
-Release:       3
+Version:       1.34
+Release:       1
 License:       GPL
 Group:         Applications/System
 Source0:       http://dl.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz
-# Source0-md5: 8d922086299ae9794b008256bde6188f
+# Source0-md5: 9be9375224f0970a55e39ebebf2a0ce5
 Source1:       http://opensource.captech.com/e2compr/ftp/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
-# Source2-md5: 992a37783bd42a897232972917e8ca7d
+# Source2-md5: 992a37783bd42a897232972917e8ca7d
 Source3:       %{name}-pl.po
 Patch0:                %{name}-info.patch
 Patch1:                e2compr-info.patch
-Patch2:                %{name}-po.patch
-Patch3:                %{name}-missing-nls.patch
-Patch4:                %{name}-nostrip.patch
-Patch5:                %{name}-potfiles-update.patch
+Patch2:                %{name}-nostrip.patch
 URL:           http://e2fsprogs.sourceforge.net/
 BuildRequires: automake
 BuildRequires: autoconf
@@ -441,15 +438,14 @@ Modu
 gunzip < %{SOURCE1} > doc/e2compr.texinfo
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
-mv -f po/de{-utf,}.po
+chmod u+w configure aclocal.m4 po/LINGUAS po/Makefile.in.in intl/Makefile.in
+
+LINGUAS=$(cat po/LINGUAS)
+echo "pl $LINGUAS" > po/LINGUAS
 cp -f %{SOURCE3} po/pl.po
 
 %build
-chmod u+w configure aclocal.m4
 %{__gettextize}
 %{__aclocal}
 %{__autoconf}
@@ -460,8 +456,11 @@ chmod u+w configure aclocal.m4
        %{?_with_allstatic:--disable-elf-shlibs} \
        %{!?_with_allstatic:--enable-elf-shlibs} \
        --enable-compression \
+       --enable-htree \
+       --enable-evms-11 \
        %{?_without_static:--enable-dynamic-e2fsck} \
-       --enable-fsck
+       --enable-fsck \
+       --disable-rpath
 
 %{__make} libs LDFLAGS="%{rpmldflags}"
 %{__make} progs LDFLAGS="%{rpmldflags}"
@@ -474,6 +473,9 @@ cd ..
 rm -rf $RPM_BUILD_ROOT
 export PATH=/sbin:$PATH
 
+echo "install-shlibs:" >> po/Makefile
+echo "install-shlibs:" >> intl/Makefile
+
 %{__make} install      DESTDIR=$RPM_BUILD_ROOT
 %{__make} install-libs DESTDIR=$RPM_BUILD_ROOT
 %{__make} -C po install        DESTDIR=$RPM_BUILD_ROOT