From 8956f5113f5f7a5782109992452b168367b92ca0 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Oct 02 2007 08:21:57 +0000 Subject: disable pint backend (which doesn't build without some BSD specific headers) --- diff --git a/sane-backends-1.0.18-pint.patch b/sane-backends-1.0.18-pint.patch deleted file mode 100644 index 2829f72..0000000 --- a/sane-backends-1.0.18-pint.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up sane-backends-1.0.18/configure.in.pint sane-backends-1.0.18/configure.in ---- sane-backends-1.0.18/configure.in.pint 2007-10-02 10:00:41.000000000 +0200 -+++ sane-backends-1.0.18/configure.in 2007-10-02 10:08:49.000000000 +0200 -@@ -406,7 +406,14 @@ else - fi - - if test "${ac_cv_header_sys_scanio_h}" = "no"; then -- echo "*** disabling PINT backend (sys/scanio.h not found)" -+ case "$host_os" in -+ *bsd*) -+ echo "*** disabling PINT backend (sys/scanio.h not found)" -+ ;; -+ *) -+ BACKENDS="${BACKENDS} pint" -+ ;; -+ esac - else - BACKENDS="${BACKENDS} pint" - fi diff --git a/sane-backends.spec b/sane-backends.spec index 4038bc0..05d0e92 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -24,7 +24,7 @@ Summary: Scanner access software Name: sane-backends Version: 1.0.18 -Release: 16%{?dist} +Release: 17%{?dist} License: GPL (programs), relaxed LGPL (libraries), and public domain (docs) Group: System Environment/Libraries Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz @@ -39,7 +39,6 @@ Patch7: sane-backends-1.0.18-udev-symlink.patch Patch8: sane-backends-1.0.18-udev-098.patch Patch9: sane-backends-1.0.18-glibc-2.7.patch Patch10: sane-backends-1.0.18-epson-cx5000.patch -Patch11: sane-backends-1.0.18-pint.patch URL: http://www.sane-project.org BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n) BuildRequires: tetex-latex @@ -138,7 +137,6 @@ want to access digital cameras. %patch9 -p1 -b .glibc-2.7 %patch10 -p1 -b .epson-cx5000 -%patch11 -p1 -b .pint for i in agfafocus avision coolscan2 umax_pp; do iconv -f iso-8859-1 -t utf-8 < "doc/sane-$i.man" > "doc/sane-$i.man_" @@ -258,6 +256,9 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/sane-backends.pc %changelog +* Tue Oct 02 2007 Nils Philippsen - 1.0.18-17 +- disable pint backend (which doesn't build without some BSD specific headers) + * Tue Oct 02 2007 Nils Philippsen - 1.0.18-16 - enable dell1600n_net (#314081) and pint backends