diff --git a/sane-backends.spec b/sane-backends.spec index 98a4552..b37f8de 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -1,7 +1,7 @@ Summary: Scanner access software. Name: sane-backends Version: 1.0.13 -Release: 3 +Release: 5.1 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 @@ -10,6 +10,7 @@ Patch1: sane-backends-1.0.11-rpath.patch Patch2: sane-backends-1.0.11-docdir.patch Patch3: sane-backends-1.0.12-badcode.patch Patch4: sane-backends-1.0.12-no_rpath.patch +Patch5: sane-backends-1.0.13-gcc34.patch URL: http://www.sane-project.org BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: tetex-latex libusb-devel libieee1284-devel @@ -57,6 +58,7 @@ included in the sane-backends package. %patch2 -p1 -b .docdir %patch3 -p1 -b .badcode %patch4 -p1 -b .no_rpath +%patch5 -p1 -b .gcc34 # Fix bug #62847. perl -pi -e 's,/dev/usbscanner0?,/dev/usb/scanner0,' backend/*.conf @@ -98,12 +100,6 @@ rm -rf %{buildroot} %postun -p /sbin/ldconfig -%triggerpostun -- sane -if ! grep -q "^%{_libdir}/sane\$" /etc/ld.so.conf; then - echo "%{_libdir}/sane" >> /etc/ld.so.conf -fi -/sbin/ldconfig -n "%{_libdir}/sane" - %files -f %{name}.lang %defattr(-,root,root) %dir /etc/sane.d @@ -128,6 +124,15 @@ fi %{_libdir}/sane/*.so %changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Feb 5 2004 Tim Waugh 1.0.13-4 +- Fixed compilation with GCC 3.4. + * Mon Dec 15 2003 Tim Waugh 1.0.13-3 - Take %%{_libdir}/sane out of ldconfig's search path altogether (Oliver Rauch).