- config.sub updated

[packages/e2fsprogs.git] / e2fsprogs.spec

diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 110f545b319b7663f9b7ab869279920f1bb85a35..c11a3e130c4115c69ccb545b521f991873daef35 100644 (file)
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -28,7 +28,7 @@ Summary(zh_CN):       
 Summary(zh_TW):        ¥Î©óºÞ²z ext2 Àɮרt²Îªº¤u¨ãµ{¦¡¡C
 Name:          e2fsprogs
 Version:       1.34
-Release:       5
+Release:       8
 License:       GPL
 Group:         Applications/System
 Source0:       http://dl.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz
@@ -42,10 +42,12 @@ Patch0:             %{name}-info.patch
 Patch1:                e2compr-info.patch
 Patch2:                %{name}-nostrip.patch
 Patch3:                %{name}-et-fixes.patch
+Patch4:                %{name}-no-empty-gettext.patch
+Patch5:                %{name}-scsi_major.patch
 URL:           http://e2fsprogs.sourceforge.net/
 BuildRequires: automake
 BuildRequires: autoconf
-BuildRequires: gettext-devel
+BuildRequires: gettext-devel >= 0.11
 BuildRequires: texinfo
 Requires(post,postun): /sbin/ldconfig
 Requires:      libcom_err = %{version}
@@ -522,6 +524,8 @@ gunzip < %{SOURCE1} > doc/e2compr.texinfo
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 chmod u+w configure aclocal.m4 po/LINGUAS po/Makefile.in.in intl/Makefile.in
 
@@ -530,6 +534,8 @@ echo "pl $LINGUAS" > po/LINGUAS
 cp -f %{SOURCE3} po/pl.po
 
 %build
+rm -f config.sub
+cp /usr/share/automake/config.sub .
 %{__gettextize}
 %{__aclocal}
 %{__autoconf}
@@ -563,10 +569,13 @@ export PATH=/sbin:$PATH
 echo "install-shlibs:" >> intl/Makefile
 
 %{__make} install \
+       root_libdir=/%{_lib} \
        DESTDIR=$RPM_BUILD_ROOT
 %{__make} install-libs \
+       root_libdir=/%{_lib} \
        DESTDIR=$RPM_BUILD_ROOT
 %{__make} -C po install        \
+       root_libdir=/%{_lib} \
        DESTDIR=$RPM_BUILD_ROOT
 
 ln -sf e2fsck $RPM_BUILD_ROOT/sbin/fsck.ext2
@@ -620,10 +629,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*attr
 %attr(755,root,root) %{_bindir}/mk_cmds
 %if ! %{with allstatic}
-%attr(755,root,root) /lib/libblkid.so.*.*
-%attr(755,root,root) /lib/libe2p.so.*.*
-%attr(755,root,root) /lib/libext2fs.so.*.*
-%attr(755,root,root) /lib/libss.so.*.*
+%attr(755,root,root) /%{_lib}/libblkid.so.*.*
+%attr(755,root,root) /%{_lib}/libe2p.so.*.*
+%attr(755,root,root) /%{_lib}/libext2fs.so.*.*
+%attr(755,root,root) /%{_lib}/libss.so.*.*
 %endif
 %{_mandir}/man1/*attr.1*
 %{_mandir}/man1/mk_cmds.1*
@@ -664,11 +673,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files evms
 %defattr(644,root,root,755)
-%attr(755,root,root) /lib/evms/*.so
+%attr(755,root,root) /%{_lib}/evms/*.so
 
 %files -n libcom_err
 %defattr(644,root,root,755)
-%{!?with_allstatic:%attr(755,root,root) /lib/libcom_err.so.*.*}
+%{!?with_allstatic:%attr(755,root,root) /%{_lib}/libcom_err.so.*.*}
 
 %files -n libcom_err-devel
 %defattr(644,root,root,755)
@@ -688,15 +697,15 @@ rm -rf $RPM_BUILD_ROOT
 %files -n libuuid
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/uuidgen
-%{!?with_allstatic:%attr(755,root,root) /lib/libuuid.so.*.*}
+%{!?with_allstatic:%attr(755,root,root) /%{_lib}/libuuid.so.*.*}
+%{_mandir}/man1/uuidgen.1*
+%lang(ja) %{_mandir}/ja/man1/uuidgen.1*
 
 %files -n libuuid-devel
 %defattr(644,root,root,755)
 %{!?with_allstatic:%attr(755,root,root) %{_libdir}/libuuid.so}
 %{_includedir}/uuid
-%{_mandir}/man1/uuidgen.1*
 %{_mandir}/man3/*uuid*
-%lang(ja) %{_mandir}/ja/man1/uuidgen.1*
 %lang(ja) %{_mandir}/ja/man3/*uuid*
 
 %files -n libuuid-static