auto-import sane-backends-1.0.13-3 from sane-backends-1.0.13-3.src.rpm

.cvsignore

@@ -1 +1 @@
-sane-backends-1.0.12.tar.gz
+sane-backends-1.0.13.tar.gz

sane-backends-1.0.12-badcode.patch

@@ -0,0 +1,13 @@
+--- sane-backends-1.0.12/backend/canon-sane.c.badcode	2003-10-08 09:42:22.000000000 +0100
++++ sane-backends-1.0.12/backend/canon-sane.c	2003-10-08 09:42:51.000000000 +0100
+@@ -1919,8 +1919,8 @@
+       for (p = buf; p < buf + nread; p++)
+ 	{
+ 	  b = *p;
+-	  *p++ = *(p + 1);
+-	  *p = b;
++	  *p = *(p + 1);
++	  *++p = b;
+ 	}
+     }
+   *len = nread;

sane-backends.spec

@@ -1,15 +1,16 @@
 Summary: Scanner access software.
 Name: sane-backends
-Version: 1.0.12
+Version: 1.0.13
-Release: 4
+Release: 3
 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
 Source1: sane.png
-Patch0: sane-backends-1.0.7-autoload.patch
 Patch1: sane-backends-1.0.11-rpath.patch
 Patch2: sane-backends-1.0.11-docdir.patch
-URL: http://www.mostang.com/sane/
+Patch3: sane-backends-1.0.12-badcode.patch
+Patch4: sane-backends-1.0.12-no_rpath.patch
+URL: http://www.sane-project.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: tetex-latex libusb-devel libieee1284-devel
 # Backend maintainer says to leave gphoto2 disabled for now.
@@ -52,13 +53,10 @@ included in the sane-backends package.
 %prep
 %setup -q
 
-# Make sure to load SCSI modules if not already loaded (bug #59979).
-cd sanei
-%patch0 -p0 -b .autoload
-cd ..
-
 %patch1 -p1 -b .rpath
 %patch2 -p1 -b .docdir
+%patch3 -p1 -b .badcode
+%patch4 -p1 -b .no_rpath
 
 # Fix bug #62847.
 perl -pi -e 's,/dev/usbscanner0?,/dev/usb/scanner0,' backend/*.conf
@@ -96,28 +94,15 @@ rm -f %{buildroot}%{_libdir}/sane/*.a %{buildroot}%{_libdir}/*.a
 %clean
 rm -rf %{buildroot}
 
-%post
+%post -p /sbin/ldconfig
-FNAME=`mktemp /etc/ld.so.conf.XXXXXX`
-grep -v "%{_libdir}/sane" /etc/ld.so.conf > ${FNAME}
-echo "%{_libdir}/sane" >> ${FNAME}
-cat ${FNAME} > /etc/ld.so.conf
-rm -f ${FNAME}
-/sbin/ldconfig
 
-%postun
+%postun -p /sbin/ldconfig
-if [ $1 = 0 ]; then
-  FNAME=`mktemp /etc/ld.so.conf.XXXXXX`
-  grep -v "%{_libdir}/sane" /etc/ld.so.conf > ${FNAME}
-  cat ${FNAME} > /etc/ld.so.conf
-  rm -f ${FNAME}
-fi
-/sbin/ldconfig
 
 %triggerpostun -- sane
 if ! grep -q "^%{_libdir}/sane\$" /etc/ld.so.conf; then
   echo "%{_libdir}/sane" >> /etc/ld.so.conf
 fi
-/sbin/ldconfig
+/sbin/ldconfig -n "%{_libdir}/sane"
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -143,6 +128,29 @@ fi
 %{_libdir}/sane/*.so
 
 %changelog
+* Mon Dec 15 2003 Tim Waugh <twaugh@redhat.com> 1.0.13-3
+- Take %%{_libdir}/sane out of ldconfig's search path altogether (Oliver
+  Rauch).
+
+* Tue Nov 25 2003 Thomas Woerner <twoerner@redhat.com> 1.0.13-2
+- no rpath in sane-config anymore
+
+* Sun Nov 23 2003 Tim Waugh <twaugh@redhat.com> 1.0.13-1
+- 1.0.13.
+- No longer need autoload, gt68xx patches.
+
+* Thu Nov 20 2003 Tim Waugh <twaugh@redhat.com> 1.0.12-6
+- Don't add %%{_libdir}/sane to ld.so.conf (bug #110419).
+
+* Tue Nov 11 2003 Tim Waugh <twaugh@redhat.com> 1.0.12-5
+- Updated gt68xx driver to fix timeout problems.
+
+* Wed Oct  8 2003 Tim Waugh <twaugh@redhat.com>
+- Avoided undefined behaviour in canon-sane.c (bug #106305).
+
+* Mon Sep 29 2003 Tim Waugh <twaugh@redhat.com>
+- Updated URL.
+
 * Thu Jul 24 2003 Tim Waugh <twaugh@redhat.com> 1.0.12-4
 - The devel package requires libieee1284-devel.
 

sources

@@ -1 +1 @@
-28d4d7469cd688dac94c7a415a81a6bb  sane-backends-1.0.12.tar.gz
+9a158413180a752f8af6f11792154a42  sane-backends-1.0.13.tar.gz