diff --git a/libgpg-error.spec b/libgpg-error.spec index bb4b95c..7b91abc 100644 --- a/libgpg-error.spec +++ b/libgpg-error.spec @@ -15,6 +15,7 @@ BuildRequires: gettext-autopoint %endif Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig +Conflicts: filesystem < 3 %description This is a library that defines common error values for all GnuPG @@ -57,33 +58,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la %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 -# Add the soname symlink. -/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_lib}/ -rm -f $RPM_BUILD_ROOT/root_marker - %check make check @@ -98,7 +72,7 @@ rm -fr $RPM_BUILD_ROOT %defattr(-,root,root) %doc COPYING COPYING.LIB AUTHORS README NEWS ChangeLog %{_bindir}/gpg-error -/%{_lib}/libgpg-error.so.0* +%{_libdir}/libgpg-error.so.0* %files devel %defattr(-,root,root)