From 2f4b2a26ed7ba02d6f3162a8da14f3889ab90a3c Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 12:02:01 +0000 Subject: [PATCH] auto-import sane-backends-1.0.7-5 from sane-backends-1.0.7-5.src.rpm --- .cvsignore | 2 +- sane-backends.spec | 112 ++++++++++++++++++++++++++------------------- sources | 2 +- 3 files changed, 67 insertions(+), 49 deletions(-) diff --git a/.cvsignore b/.cvsignore index ab332ae..c6c9fdb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -sane-backends-1.0.5.tar.gz +sane-backends-1.0.7.tar.gz diff --git a/sane-backends.spec b/sane-backends.spec index 98c9256..063ab17 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -1,48 +1,41 @@ Summary: Scanner access software. Name: sane-backends -Version: 1.0.5 -Release: 4.3 +Version: 1.0.7 +Release: 5 License: GPL (programs), relaxed LGPL (libraries), and public domain (docs) Group: System Environment/Libraries -#Source: ftp://ftp.mostang.com/pub/sane/%{name}-%{version}.tar.gz Source: ftp://ftp.mostang.com/pub/sane/sane-%{version}/%{name}-%{version}.tar.gz Source1: sane.png Patch0: sane-sparc.patch -Patch1: sane-backends-1.0.5-tmpfile-bh.patch -Patch2: sane-backends-1.0.5-tmpfile-dc25.patch -Patch3: sane-backends-1.0.5-tmpfile-qcam.patch -Patch4: sane-backends-1.0.5-tmpfile-snapscan.patch -Patch5: sane-backends-1.0.5-tmpfile-st400.patch -Patch6: sane-backends-1.0.5-saned.patch +Patch1: sane-backends-1.0.7-defaultincl.patch +Patch2: sane-backends-1.0.7-argv.patch URL: http://www.mostang.com/sane/ BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: tetex-latex -%ifnarch ia64 sparc64 -Provides: libsane.so.1 -%else -Provides: libsane.so.1()(64bit) +BuildRequires: tetex-latex libusb-devel +# Backend maintainer says to leave gphoto2 disabled for now. +%define gphoto2_support 0 +%if %{gphoto2_support} +BuildRequires: gphoto2-devel %endif Prereq: /sbin/ldconfig, /bin/mktemp, /bin/grep, /bin/cat, /bin/rm -BuildPrereq: tetex-latex libtool ExcludeArch: s390 s390x %description -Scanner Access Now Easy (SANE) is a universal scanner interface. The +Scanner Access Now Easy (SANE) is a universal scanner interface. The SANE application programming interface (API) provides standardized access to any raster image scanner hardware (flatbed scanner, hand-held scanner, video and still cameras, frame-grabbers, etc.). If -they are using SANE, developers can write image-processing -applications without having to think about the peculiarities of -individual devices. SANE also makes it possible to write a device -driver once, which can then be used by any SANE-compliant -application. SANE currently includes drivers for some Epson SCSI -scanners, HP ScanJet SCSI scanners, Microtek SCSI scanners, Mustek -SCSI flatbed scanners, PINT devices, most UMAX SCSI scanners, -Connectix QuickCam, and other SANE devices via network. Note that this -package does not enable network scanning by default. If you wish to -enable network scanning, read the saned(1) manpage. If you would like -to develop SANE modules, you should also install the -sane-backends-devel package. +they're using SANE, developers can write image-processing applications +without having to think about the peculiarities of individual devices. +SANE also makes it possible to write a device driver once, which can +then be used by any SANE-compliant application. SANE currently +includes drivers for some Epson SCSI scanners, HP ScanJet SCSI +scanners, Microtek SCSI scanners, Mustek SCSI flatbed scanners, PINT +devices, most UMAX SCSI scanners, Connectix QuickCam, and other SANE +devices via network. Note that this package does not enable network +scanning by default. If you wish to enable network scanning, read the +saned(1) manpage. If you'd like to develop SANE modules, you should +also install the sane-backends-devel package. %package devel Summary: The SANE (a universal scanner interface) development toolkit. @@ -53,30 +46,28 @@ Provides: sane-devel %description devel Static libraries and header files for writing Scanner Access Now Easy -(SANE) modules. SANE is a universal scanner interface which is +(SANE) modules. SANE is a universal scanner interface which is included in the sane-backends package. %prep %setup -q %patch0 -p1 -b .sparc - -# Fix temporary file handling -%patch1 -p1 -b .bh -%patch2 -p1 -b .dc25 -%patch3 -p1 -b .qcam -%patch4 -p1 -b .snapscan -%patch5 -p3 -b .st400 -%patch6 -p1 -b .saned +%patch1 -p1 -b .defaultincl +%patch2 -p1 -b .argv %build %{expand:%%define optflags %{optflags} -DGIMP_ENABLE_COMPAT_CRUFT=1} -%configure -make LIBTOOL=/usr/bin/libtool +%if %{gphoto2_support} +%configure --with-gphoto2=/usr +%else +%configure --without-gphoto2 +%endif +make %install rm -rf %{buildroot} -%{makeinstall} LIBTOOL=/usr/bin/libtool +%{makeinstall} 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 @@ -134,16 +125,43 @@ fi %{_libdir}/sane/*.so %changelog -* Mon Oct 6 2003 Tim Waugh 1.0.5-4.3 -- Build with installed libtool. +* Mon Mar 4 2002 Tim Powers +- bump release number, wasn't bumped last time -* Thu Sep 11 2003 Tim Waugh 1.0.5-4.2 -- Fix saned security issues. +* Mon Mar 3 2002 Tim Waugh 1.0.7-4 +- Update sparc patch (Tom "spot" Callaway). -* Wed Dec 19 2001 Tim Waugh 1.0.5-4.1 -- Fix temporary file handling. +* Thu Feb 21 2002 Tim Waugh 1.0.7-3 +- Rebuild in new environment. +- Disable bad stdarg code in scanimage so that alpha builds succeed. -* Fri Jul 20 2001 Florian La Roche +* Mon Feb 11 2002 Tim Waugh 1.0.7-2 +- Make sure sane-config doesn't specify the default include path + (bug #59507). + +* Mon Feb 4 2002 Tim Waugh 1.0.7-1 +- 1.0.7. + +* Sun Jan 27 2002 Tim Waugh 1.0.7-0.beta2.1 +- 1.0.7-beta2. + +* Wed Jan 23 2002 Tim Waugh 1.0.7-0.beta1.1 +- 1.0.7-beta1. +- Patches no longer needed: scsi, microtek2, format. + +* Wed Jan 09 2002 Tim Powers 1.0.6-4 +- automated rebuild + +* Wed Nov 21 2001 Tim Waugh 1.0.6-3 +- Fix default file names format in batch scans (bug #56542). + +* Tue Nov 20 2001 Tim Waugh 1.0.6-2 +- Apply Maurice Hilarius's patch to avoid kill(-1,SIGTERM) (bug #56540). + +* Mon Nov 5 2001 Tim Waugh 1.0.6-1 +- 1.0.6. + +* Fri Jul 20 2001 Florian La Roche 1.0.5-4 - exclude s390, s390x * Tue Jul 17 2001 Preston Brown 1.0.5-3 diff --git a/sources b/sources index 04b3309..0d61b99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4e95675d474609b2b5d8eebdef2e0915 sane-backends-1.0.5.tar.gz +6010d68d8a8c29d1dcbf0c6d5005770b sane-backends-1.0.7.tar.gz