From 8f0a299b1212522864362c91170cc7c6617cf55a Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 12:02:06 +0000 Subject: [PATCH] auto-import sane-backends-1.0.7-6 from sane-backends-1.0.7-6.src.rpm --- sane-backends.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/sane-backends.spec b/sane-backends.spec index 063ab17..4b6b31a 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -1,7 +1,7 @@ Summary: Scanner access software. Name: sane-backends Version: 1.0.7 -Release: 5 +Release: 6 License: GPL (programs), relaxed LGPL (libraries), and public domain (docs) Group: System Environment/Libraries Source: ftp://ftp.mostang.com/pub/sane/sane-%{version}/%{name}-%{version}.tar.gz @@ -9,6 +9,7 @@ Source1: sane.png Patch0: sane-sparc.patch Patch1: sane-backends-1.0.7-defaultincl.patch Patch2: sane-backends-1.0.7-argv.patch +Patch3: sane-backends-1.0.7-autoload.patch URL: http://www.mostang.com/sane/ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: tetex-latex libusb-devel @@ -55,6 +56,10 @@ included in the sane-backends package. %patch1 -p1 -b .defaultincl %patch2 -p1 -b .argv +# Make sure to load SCSI modules if not already loaded (bug #59979). +cd sanei +%patch3 -p0 -b .autoload + %build %{expand:%%define optflags %{optflags} -DGIMP_ENABLE_COMPAT_CRUFT=1} %if %{gphoto2_support} @@ -125,7 +130,11 @@ fi %{_libdir}/sane/*.so %changelog -* Mon Mar 4 2002 Tim Powers +* Mon Mar 4 2002 Tim Waugh 1.0.7-6 +- Re-apply the original 1.0.7-4 fix (oops): + - Make sure to load SCSI modules if not already loaded (bug #59979). + +* Mon Mar 4 2002 Tim Powers 1.0.7-5 - bump release number, wasn't bumped last time * Mon Mar 3 2002 Tim Waugh 1.0.7-4