- outdated.

[packages/e2fsprogs.git] / e2fsprogs.spec

diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index f18e326177af0b9920fe108c27840a9ce96fd265..983b0b9e1b3ad124986fdc911408d6083739f6ec 100644 (file)
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -26,19 +26,19 @@ Summary(uk):        
 Summary(zh_CN):        ¹ÜÀíµÚ¶þÀ©Õ¹£¨ext2£©ÎļþϵͳµÄ¹¤¾ß¡£
 Summary(zh_TW):        ¥Î©óºÞ²z ext2 Àɮרt²Îªº¤u¨ãµ{¦¡¡C
 Name:          e2fsprogs
-Version:       1.27
-Release:       7
+Version:       1.29
+Release:       3
 License:       GPL
 Group:         Applications/System
 Source0:       ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/%{name}-%{version}.tar.gz
 Source1:       http://opensource.captech.com/e2compr/ftp/e2compr-0.4.texinfo.gz
 Source2:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
+Source3:       %{name}-pl.po
 Patch0:                %{name}-info.patch
 Patch1:                e2compr-info.patch
 Patch2:                %{name}-mountlabel3.patch
-Patch3:                %{name}-rlimit-workaround.patch
-Patch4:                %{name}-manpage.patch
-Patch5:                %{name}-po.patch
+Patch3:                %{name}-manpage.patch
+Patch4:                %{name}-po.patch
 URL:           http://e2fsprogs.sourceforge.net/
 PreReq:                /sbin/ldconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -421,18 +421,23 @@ e2fsprogs-devel-static ͦ
 %setup -q
 %patch0 -p1
 gunzip < %{SOURCE1} > doc/e2compr.texinfo
-patch -s -p1 < %{PATCH1}
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p0
+%patch4 -p0
+
+cp -f %{SOURCE3} po/pl.po
 
 %build
 chmod u+w configure aclocal.m4
-%{__gettextize}
-aclocal
+if gettextize --version | grep -q '0\.11\.' ; then
+       %{__gettextize} --intl
+       cp -f po/Makevars{.template,}
+else
+       %{__gettextize}
+fi
+%{__aclocal}
 %{__autoconf}
-
 %configure \
        --with-root-prefix=/ \
        %{!?_without_nls:--enable-nls} \
@@ -472,6 +477,9 @@ echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/$a/man8/mkfs.ext3.8
 
 %{!?_without_nls:%find_lang %{name}}
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %post
 /sbin/ldconfig
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
@@ -486,9 +494,6 @@ echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/$a/man8/mkfs.ext3.8
 %postun devel
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files %{!?_without_nls:-f %{name}.lang}
 %defattr(644,root,root,755)
 %attr(755,root,root) /sbin/*