From 98c80508642ef2cb6c20d6aea855cf091cd6d972 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Tue, 20 Dec 2005 12:32:07 +0000
Subject: [PATCH] version 1.0.17 reenable gphoto2 backend

---
 .cvsignore         |  2 +-
 sane-backends.spec | 19 ++++++++++++-------
 sources            |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 77744d2..5b1dd79 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-sane-backends-1.0.16.tar.gz
+sane-backends-1.0.17.tar.gz
diff --git a/sane-backends.spec b/sane-backends.spec
index 1921e33..07b8411 100644
--- a/sane-backends.spec
+++ b/sane-backends.spec
@@ -1,7 +1,10 @@
-Summary: Scanner access software.
+# Disable gphoto2 backend by using --without gphoto2
+%define gphoto2_support 0%{!?_without_gphoto2:1}
+
+Summary: Scanner access software
 Name: sane-backends
-Version: 1.0.16
-Release: 2.1
+Version: 1.0.17
+Release: 1
 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
@@ -11,10 +14,8 @@ Patch1: sane-backends-1.0.11-rpath.patch
 Patch3: sane-backends-1.0.12-badcode.patch
 Patch5: sane-backends-multilib.patch
 URL: http://www.sane-project.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
 BuildRequires: tetex-latex libusb-devel libieee1284-devel libjpeg-devel
-# Backend maintainer says to leave gphoto2 disabled for now.
-%define gphoto2_support 0
 %if %{gphoto2_support}
 BuildRequires: gphoto2-devel
 %endif
@@ -79,7 +80,7 @@ autoconf
 %build
 %{expand:%%define optflags %{optflags} -DGIMP_ENABLE_COMPAT_CRUFT=1}
 %if %{gphoto2_support}
-%configure --with-gphoto2=/usr --with-docdir=%{_docdir}/%{name}-%{version}
+%configure --with-gphoto2=%{_prefix} --with-docdir=%{_docdir}/%{name}-%{version}
 %else
 %configure --without-gphoto2 --with-docdir=%{_docdir}/%{name}-%{version}
 %endif
@@ -134,6 +135,10 @@ rm -rf %{buildroot}
 %{_libdir}/sane/*.so
 
 %changelog
+* Tue Dec 20 2005 Nils Philippsen <nphilipp@redhat.com> 1.0.17-1
+- version 1.0.17
+- reenable gphoto2 backend
+
 * Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
 - rebuilt
 
diff --git a/sources b/sources
index fd006e7..dab035a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bec9b9262246316b4ebfe2bc7451aa28  sane-backends-1.0.16.tar.gz
+b51c10da8a81a04e1bae88c9e6556df2  sane-backends-1.0.17.tar.gz