diff --git a/sane-backends.spec b/sane-backends.spec index 33373ed..8f6d700 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -1,7 +1,7 @@ Summary: Scanner access software. Name: sane-backends Version: 1.0.9 -Release: 5.3 +Release: 5.4 License: GPL (programs), relaxed LGPL (libraries), and public domain (docs) Group: System Environment/Libraries Source0: ftp://ftp.mostang.com/pub/sane/sane-%{version}/%{name}-%{version}.tar.gz @@ -89,7 +89,7 @@ make rm -rf %{buildroot} %{makeinstall} docdir=%{buildroot}/%{_docdir}/%{name}-%{version} perl -pi -e "s/installed.*/installed=yes/g" $RPM_BUILD_ROOT%{_libdir}/libsane.la -/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_libdir}/sane +/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir} mkdir -p %{buildroot}%{_datadir}/pixmaps install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps @@ -112,7 +112,7 @@ rm -rf %{buildroot} %{_sbindir}/* %{_libdir}/libsane*.so.* %dir %{_libdir}/sane -%{_libdir}/sane/*.so.* +%{_libdir}/sane/libsane-*.so.* %{_mandir}/*/* %{_datadir}/pixmaps/sane.png %{_docdir}/* @@ -124,9 +124,12 @@ rm -rf %{buildroot} %{_libdir}/libsane*.la %{_libdir}/libsane*.so %{_libdir}/sane/*.la -%{_libdir}/sane/*.so +%{_libdir}/sane/libsane-*.so %changelog +* Wed Dec 24 2003 Tim Waugh 1.0.9-5.4 +- Don't run ldconfig in %%{_libdir}/sane even in %%install. + * Tue Dec 16 2003 Tim Waugh 1.0.9-5.3 - Put rpath tricks back in but take out ld.so.conf tampering (better fix for bug #110174).