--- e2fsprogs.spec.orig 2004-04-12 15:01:26 +0400 +++ e2fsprogs.spec 2004-07-26 18:07:05 +0400 @@ -1,6 +1,6 @@ Name: e2fsprogs Version: 1.35 -Release: alt2 +Release: alt3 Summary: The filesystem utilities for the ext2/ext3 filesystems License: GPL @@ -109,19 +109,19 @@ done %install -%__mkdir_p $RPM_BUILD_ROOT{/lib,%_includedir/e2p} +%__mkdir_p $RPM_BUILD_ROOT{/%_lib,%_includedir/e2p} %make_install install install-libs \ DESTDIR="$RPM_BUILD_ROOT" root_prefix="" -# Relocate shared libraries from %_libdir/ to /lib/. +# Relocate shared libraries from %_libdir/ to /%_lib/. for f in $RPM_BUILD_ROOT%_libdir/*.so; do v="$RPM_BUILD_ROOT$(readlink -n "$f")" t=`objdump -p "$v" |awk '/SONAME/ {print $2}'` [ -n "$t" ] - %__ln_s -nf ../../lib/"$t" "$f" + %__ln_s -nf ../../%_lib/"$t" "$f" done -mv $RPM_BUILD_ROOT%_libdir/*.so.* $RPM_BUILD_ROOT/lib/ +mv $RPM_BUILD_ROOT%_libdir/*.so.* $RPM_BUILD_ROOT/%_lib/ pushd $RPM_BUILD_ROOT %__subst 's,^ET_DIR=.*$,ET_DIR=%_datadir/et,' .%_bindir/compile_et @@ -180,7 +180,7 @@ %_docdir/%name-%version/RE* %files -n libe2fs -/lib/*.so.* +/%_lib/*.so.* %dir %_docdir/%name-%version %_docdir/%name-%version/SHLIBS @@ -204,6 +204,9 @@ %_libdir/evms/* %changelog +* Mon Jul 26 2004 Kachalov Anton 1.35-alt3 +- Change /lib to /%_lib to make compile on x86_64 + * Mon Apr 12 2004 Dmitry V. Levin 1.35-alt2 - Fixed false "check after next mount" warning.