diff --git a/.cvsignore b/.cvsignore index c6c9fdb..a6339d4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -sane-backends-1.0.7.tar.gz +sane-backends-1.0.8.tar.gz diff --git a/sane-backends.spec b/sane-backends.spec index f6c3691..2c7f16b 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -1,16 +1,14 @@ Summary: Scanner access software. Name: sane-backends -Version: 1.0.7 -Release: 6.2 +Version: 1.0.8 +Release: 4 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 +Source0: ftp://ftp.mostang.com/pub/sane/sane-%{version}/%{name}-%{version}.tar.gz 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 -Patch4: sane-backends-1.0.8-saned.patch +Patch1: sane-backends-1.0.7-autoload.patch +Patch2: sane-backends-1.0.8-rpath.patch URL: http://www.mostang.com/sane/ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: tetex-latex libusb-devel @@ -54,15 +52,16 @@ included in the sane-backends package. %prep %setup -q %patch0 -p1 -b .sparc -%patch1 -p1 -b .defaultincl -%patch2 -p1 -b .argv # Make sure to load SCSI modules if not already loaded (bug #59979). -pushd sanei -%patch3 -p0 -b .autoload -popd +cd sanei +%patch1 -p0 -b .autoload +cd .. -%patch4 -p1 -b .saned +%patch2 -p1 -b .rpath + +# Fix bug #62847. +perl -pi -e 's,/dev/usbscanner0?,/dev/usb/scanner0,' backend/*.conf %build %{expand:%%define optflags %{optflags} -DGIMP_ENABLE_COMPAT_CRUFT=1} @@ -127,17 +126,28 @@ fi %defattr(-,root,root) %{_includedir}/sane %{_libdir}/libsane*.la -%{_libdir}/libsane*.a %{_libdir}/libsane*.so %{_libdir}/sane/*.la -%{_libdir}/sane/*.a %{_libdir}/sane/*.so %changelog -* Thu Sep 11 2003 Tim Waugh 1.0.7-6.2 -- Fix saned security issues. +* Fri Jun 21 2002 Tim Waugh 1.0.8-4 +- Fix bug #62847. + +* Tue Jun 18 2002 Tim Waugh 1.0.8-3 +- Fix dangling symlink (bug #66672). + +* Wed Jun 12 2002 Tim Waugh 1.0.8-2 +- Don't tell SANE applications to use rpath (bug #66129, bug #66132). + +* Mon May 27 2002 Tim Waugh 1.0.8-1 +- 1.0.8. + +* Wed May 22 2002 Tim Waugh 1.0.8-0.20020522.1 +- Update to CVS. Release expected before the end of the month. +- No longer need defaultincl or argv patches. -* Wed May 15 2002 Tim Waugh 1.0.7-6.1 +* Wed May 15 2002 Tim Waugh 1.0.7-7 - Unconditionally run ldconfig after installation (bug #64964). * Mon Mar 4 2002 Tim Waugh 1.0.7-6 diff --git a/sources b/sources index 0d61b99..5f05a8e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6010d68d8a8c29d1dcbf0c6d5005770b sane-backends-1.0.7.tar.gz +10785bf9a87e0f45ad445e34a8529a3d sane-backends-1.0.8.tar.gz