diff --git a/libgpg-error.spec b/libgpg-error.spec index ff4845f..aae7cbd 100644 --- a/libgpg-error.spec +++ b/libgpg-error.spec @@ -1,7 +1,7 @@ Summary: libgpg-error Name: libgpg-error Version: 1.5 -Release: 1 +Release: 2 URL: ftp://ftp.gnupg.org/gcrypt/libgpg-error/ Source0: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2 Source1: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2.sig @@ -45,6 +45,31 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/common-lisp %find_lang %{name} +# Relocate the shared libraries to /%{_lib}. +mkdir -p $RPM_BUILD_ROOT/%{_lib} +for shlib in $RPM_BUILD_ROOT/%{_libdir}/*.so* ; do + if test -L "$shlib" ; then + rm "$shlib" + else + mv "$shlib" $RPM_BUILD_ROOT/%{_lib}/ + fi +done +# Figure out where /%{_lib} is relative to %{_libdir}. +touch $RPM_BUILD_ROOT/root_marker +relroot=.. +while ! test -f $RPM_BUILD_ROOT/%{_libdir}/$relroot/root_marker ; do + relroot=$relroot/.. +done +# Overwrite development symlinks. +pushd $RPM_BUILD_ROOT/%{_libdir} +for shlib in $relroot/%{_lib}/lib*.so.* ; do + shlib=`echo "$shlib" | sed -e 's,//,/,g'` + target=`basename "$shlib" | sed -e 's,\.so.*,,g'`.so + ln -sf $shlib $target +done +popd +rm -f $RPM_BUILD_ROOT/root_marker + %clean rm -fr $RPM_BUILD_ROOT @@ -56,7 +81,7 @@ rm -fr $RPM_BUILD_ROOT %defattr(-,root,root) %doc COPYING COPYING.LIB AUTHORS README INSTALL NEWS ChangeLog %{_bindir}/gpg-error -%{_libdir}/libgpg-error.so.* +/%{_lib}/libgpg-error.so.* %files devel %defattr(-,root,root) @@ -67,6 +92,9 @@ rm -fr $RPM_BUILD_ROOT %{_datadir}/aclocal/gpg-error.m4 %changelog +* Fri Jul 27 2007 Nalin Dahyabhai - 1.5-2 +- move libgpg-error shared library to /%{_lib} (#249816) + * Thu Jul 19 2007 Nalin Dahyabhai - 1.5-1 - update to 1.5