--- libpopt.spec.orig 2004-05-21 16:09:52 +0400 +++ libpopt.spec 2004-07-26 18:31:37 +0400 @@ -1,6 +1,6 @@ Name: libpopt Version: 1.7 -Release: alt12 +Release: alt13 Serial: 1 %define srcname popt-20020315 @@ -88,18 +88,18 @@ %{?_with_apidocs:make doxygen} %install -%__mkdir_p $RPM_BUILD_ROOT/lib +%__mkdir_p $RPM_BUILD_ROOT/%_lib %make_install install DESTDIR="$RPM_BUILD_ROOT" %{?_with_apidocs:%__install -p -m644 doxygen/man/man3/popt.h.3 $RPM_BUILD_ROOT%_man3dir/} -# Relocate shared libraries from %_libdir/ to /lib/. +# Relocate shared libraries from %_libdir/ to /%_lib/. for f in $RPM_BUILD_ROOT%_libdir/*.so; do t=`objdump -p "$f" |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/ bzip2 -9 *.ps ||: @@ -109,7 +109,7 @@ %postun -p %postun_ldconfig %files -f popt.lang -/lib/*.so.* +/%_lib/*.so.* %files devel %_libdir/*.so @@ -121,6 +121,9 @@ %_libdir/*.a %changelog +* Mon Jul 26 2004 Kachalov Anton 1:1.7-alt13 +- Change /lib to /%_lib to make compile on x86_64 + * Fri May 21 2004 Dmitry V. Levin 1:1.7-alt12 - Changed poptBadOption() to return more appropriate value in case of execCommand() failure (#1928).