Updated to version 2.0.24

02_frontends_libs.dpatch

@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_frontends_libs.dpatch by  <jblache@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Only link frontends against the libraries they need.
-
-@DPATCH@
-diff -urNad sane-backends-1.0.20~/frontend/Makefile.in sane-backends-1.0.20/frontend/Makefile.in
---- sane-backends-1.0.20~/frontend/Makefile.in	2009-04-30 15:41:19.000000000 +0200
-+++ sane-backends-1.0.20/frontend/Makefile.in	2009-05-04 11:53:49.669902772 +0200
-@@ -144,7 +144,7 @@
- LATEX = @LATEX@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@
-+LIBS = 
- LIBTOOL = @LIBTOOL@
- LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
- LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
-@@ -254,7 +254,7 @@
- scanimage_LDADD = ../lib/liblib.la ../lib/libfelib.la ../backend/libsane.la
- saned_SOURCES = saned.c
- saned_LDADD = ../sanei/libsanei.la ../lib/liblib.la ../lib/libfelib.la \
--  ../backend/libsane.la @SYSLOG_LIBS@
-+  ../backend/libsane.la @SYSLOG_LIBS@ @AVAHI_LIBS@
- 
- test_SOURCES = test.c
- test_LDADD = ../lib/liblib.la ../lib/libfelib.la ../backend/libsane.la

03_libsane_deps.dpatch

@@ -1,15 +0,0 @@
---- sane-backends-1.0.21/backend/Makefile.in~	2010-04-30 11:39:07.000000000 +0200
-+++ sane-backends-1.0.21/backend/Makefile.in	2010-05-02 23:35:59.000000000 +0200
-@@ -2355,10 +2355,10 @@
- nodist_libsane_la_SOURCES = dll-s.c
- libsane_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll
- libsane_la_LDFLAGS = $(DIST_LIBS_LDFLAGS)
--libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo $(DL_LIBS) $(LIBV4L_LIBS) $(MATH_LIB) $(IEEE1284_LIBS) $(TIFF_LIBS) $(JPEG_LIBS) $(GPHOTO2_LIBS) $(SOCKET_LIBS) $(USB_LIBS) $(AVAHI_LIBS) $(SCSI_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS)
-+libsane_la_LIBADD = $(COMMON_LIBS) libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_config.lo ../sanei/sanei_constrain_value.lo $(DL_LIBS)
- 
- # WARNING: Automake is getting this wrong so have to do it ourselves.
--libsane_la_DEPENDENCIES = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo @SANEI_SANEI_JPEG_LO@
-+libsane_la_DEPENDENCIES = libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_config.lo
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 

sane-backends-1.0.20-hal.patch

@@ -1,62 +0,0 @@
-commit b4b171c4918d39c38d03bafe98bc52684e7927e1
-Author: Nils Philippsen <nils@redhat.com>
-Date:   Mon Jun 22 18:25:01 2009 +0200
-
-    patch: hal
-    
-    Squashed commit of the following:
-    
-    commit 5a4809b0c721ac14b8e56064ee3df573e75e0b67
-    Author: Nils Philippsen <nils@redhat.com>
-    Date:   Mon Jun 22 18:23:27 2009 +0200
-    
-        separate HAL information and policy
-    
-    commit a50c619ddbb869612e99a9457b1f39492f34b141
-    Author: Nils Philippsen <nils@redhat.com>
-    Date:   Tue Jun 16 15:21:59 2009 +0200
-    
-        adapt HAL fdi files for Fedora
-
-diff --git a/tools/Makefile.am b/tools/Makefile.am
-index bd6dd9d..bb26fcb 100644
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -79,7 +79,7 @@ udev/libsane.rules: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard
- 	   -d 0 > $@
- 
- hal/libsane.fdi: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc
--	@./sane-desc -m hal -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \
-+	@./sane-desc -m hal-new -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \
- 	   -d 0 > $@
- 
- sane-backends.pc:	$(top_builddir)/config.status
-diff --git a/tools/hal/libsane-policy.fdi b/tools/hal/libsane-policy.fdi
-new file mode 100644
-index 0000000..2ac8211
---- /dev/null
-+++ b/tools/hal/libsane-policy.fdi
-@@ -0,0 +1,11 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<deviceinfo version="0.2">
-+  <device>
-+    <match key="info.subsystem" string="usb">
-+      <!-- The following rule will disable autosuspend for USB scanner devices -->
-+      <match key="info.capabilities" contains="scanner">
-+        <append key="info.callouts.add" type="strlist">hal-usb-scanner-add</append>
-+      </match>
-+    </match>
-+  </device>
-+</deviceinfo>
-diff --git a/tools/sane-desc.c b/tools/sane-desc.c
-index 600ab03..c317700 100644
---- a/tools/sane-desc.c
-+++ b/tools/sane-desc.c
-@@ -3667,7 +3667,6 @@ print_hal (int new)
-       printf (" -->\n");
-       printf ("        <match key=\"usb.product_id\" int=\"%s\">\n", usbid->usb_product_id);
-       printf ("          <append key=\"info.capabilities\" type=\"strlist\">scanner</append>\n");
--      printf ("          <merge key=\"scanner.access_method\" type=\"string\">proprietary</merge>\n");
-       printf ("        </match>\n");
- 
-       usbid = usbid->next;

sane-backends-1.0.21-link.patch

@@ -1,22 +0,0 @@
---- backend/Makefile.am.link	2010-12-04 18:15:16.000000000 +0000
-+++ backend/Makefile.am	2010-12-04 18:16:13.000000000 +0000
-@@ -1089,7 +1089,7 @@
- nodist_libsane_la_SOURCES =  dll-s.c
- libsane_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll
- libsane_la_LDFLAGS = $(DIST_LIBS_LDFLAGS)
--libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo $(DL_LIBS) $(LIBV4L_LIBS) $(MATH_LIB) $(IEEE1284_LIBS) $(TIFF_LIBS) $(JPEG_LIBS) $(GPHOTO2_LIBS) $(SOCKET_LIBS) $(USB_LIBS) $(AVAHI_LIBS) $(SCSI_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS)
-+libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo $(DL_LIBS) $(IEEE1284_LIBS) $(USB_LIBS)
- 
- # WARNING: Automake is getting this wrong so have to do it ourselves.
- libsane_la_DEPENDENCIES = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo @SANEI_SANEI_JPEG_LO@
---- tools/sane-config.in.orig	2010-12-04 19:18:07.000000000 +0000
-+++ tools/sane-config.in	2010-12-04 19:19:22.000000000 +0000
-@@ -13,7 +13,7 @@
- exec_prefix="@exec_prefix@"
- 
- LDFLAGS="@LDFLAGS@ @GPHOTO2_LDFLAGS@"
--LIBS="@LIBS@ @DL_LIBS@ @LIBV4L_LIBS@ @MATH_LIB@ @TIFF_LIBS@ @JPEG_LIBS@ @GPHOTO2_LIBS@ @SOCKET_LIBS@ @AVAHI_LIBS@ @USB_LIBS@ @SCSI_LIBS@ @RESMGR_LIBS@"
-+LIBS="@DL_LIBS@ @USB_LIBS@ @IEEE1284_LIBS@"
- pkgincludedir="@pkgincludedir@"
- pkglibdir="@pkglibdir@"
- includedir="@includedir@"

sane-hp_rts88xx-0.18_fix_link.patch

@@ -1,11 +0,0 @@
-diff -p -up sane-backends-1.0.19/backend/Makefile.in~ sane-backends-1.0.19/backend/Makefile.in
---- sane-backends-1.0.19/backend/Makefile.in~	2008-05-23 08:42:16.000000000 -0400
-+++ sane-backends-1.0.19/backend/Makefile.in	2008-05-23 09:44:58.000000000 -0400
-@@ -361,6 +361,7 @@ libsane-abaton.la: ../sanei/sanei_scsi.l
- libsane-hp_rts88xx.la: ../sanei/sanei_config2.lo 
- libsane-hp_rts88xx.la: ../sanei/sanei_constrain_value.lo 
- libsane-hp_rts88xx.la: ../sanei/sanei_usb.lo
-+libsane-hp_rts88xx.la: ../sanei/sanei_scsi.lo
- libsane-agfafocus.la: ../sanei/sanei_config2.lo
- libsane-agfafocus.la: ../sanei/sanei_constrain_value.lo
- libsane-agfafocus.la: ../sanei/sanei_scsi.lo

sane-sparc.patch

@@ -1,43 +0,0 @@
---- sane-1.0.2/sanei/sanei_ab306.c.orig	Thu May 18 18:22:45 2000
-+++ sane-1.0.2/sanei/sanei_ab306.c	Thu May 18 18:24:27 2000
-@@ -49,6 +49,10 @@
- 
- #include <sys/types.h>
- 
-+#ifdef __sparc__
-+#define IO_SUPPORT_MISSING
-+#else
-+
- #ifdef HAVE_SYS_IO_H
- # include <sys/io.h>	/* use where available (glibc 2.x, for example) */
- #elif HAVE_ASM_IO_H
-@@ -72,6 +76,8 @@
- 
- #else
- # define IO_SUPPORT_MISSING
-+#endif
-+
- #endif
- 
- #include <sane/sane.h>
---- sane-1.0.2/sanei/sanei_pio.c.orig	Thu May 18 18:24:42 2000
-+++ sane-1.0.2/sanei/sanei_pio.c	Thu May 18 18:25:31 2000
-@@ -58,6 +58,10 @@
- # include <unistd.h>
- #endif
- 
-+#ifdef __sparc__
-+#define IO_SUPPORT_MISSING
-+#else
-+
- #ifdef HAVE_SYS_IO_H
- # include <sys/io.h>	/* use where available (glibc 2.x, for example) */
- #elif HAVE_ASM_IO_H
-@@ -83,6 +87,7 @@
- 
- #else
- # define IO_SUPPORT_MISSING
-+#endif
- #endif
- 
- #include <sane/sane.h>

sane.spec

@@ -4,6 +4,10 @@
 %define libname	%mklibname %{name} %{major}
 %define devname	%mklibname %{name} %{major} -d
 
+%bcond_with gphoto2 
+%bcond_with primax
+%bcond_with v4l
+%bcond_with epkowa
 
 # All sane backends have SONAME libsane.so.1. We do not want
 # sane-backends-iscan to provide libsane.so.1, so filter these out.
@@ -19,35 +23,22 @@
 # do not search for all existing scanner models which makes their startup
 # slow (the user or "scannerdrake" has to insert the names of the really
 # installed scanners then)
-%define empty_dll_conf 0
+%bcond_without empty_dll_conf
-
-%define gphoto2_support 1
-%define v4l_support 1
-# Switch to disable the compilation of the "primax" backend in case of
-# problems
-%define primax_support 1
-# Switch to disable the compilation of the "epkowa" backend in case of
-# problems
-%define epkowa_support 1
-%ifarch alpha ppc sparc %arm %mips
-%define primax_support 0
-%define epkowa_support 0
-%endif
 
 Summary:	SANE - local and remote scanner access
 Name:		sane
-Version:	1.0.23
+Version:	1.0.24
-Release:	5
+Release:	1
 # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
 # Tools are GPLv2+, docs are public domain
 License: 	GPLv2+ and GPLv2+ with exceptions and Public Domain
 Group:		Graphics
 Url:		http://www.sane-project.org/
-Source0:	ftp://ftp.sane-project.org/pub/sane/sane-%{version}/sane-backends-%{version}%{beta}.tar.gz
+Source0:	http://alioth.debian.org/frs/download.php/file/3958/sane-backends-1.0.24.tar.gz
-Source3:	http://belnet.dl.sourceforge.net/sourceforge/px-backend/primaxscan-1.1.beta1.tar.bz2
+Source3:	http://downloads.sourceforge.net/project/px-backend/primaxscan-source/1.1.beta1/primaxscan-1.1.beta1.tar.gz
 Source5:	saned-xinetd
-Source9:	http://heanet.dl.sourceforge.net/sourceforge/hp44x0backend/sane_hp_rts88xx-0.18.tar.bz2
+Source9:	http://downloads.sourceforge.net/project/hp44x0backend/hp44x0backend/sane_hp_rts88xx-0.18/sane_hp_rts88xx-0.18.tar.gz
-Source10:	http://heanet.dl.sourceforge.net/sourceforge/brother-mfc/sane-driver-0.2.tar.bz2
+Source10:	http://downloads.sourceforge.net/project/brother-mfc/brother-mfc/sane-driver/sane-driver-0.2.tar.gz
 Source11:	http://www.geocities.com/trsh0101/SANE/primascan.h
 Source12:	http://www.geocities.com/trsh0101/SANE/primascan.c
 # The free part of Epson's scanner driver package IScan, full package
@@ -58,7 +49,6 @@ Source13:	iscan_%{iscanversion}-4-free.tar.bz2
 Source14:	http://downloads.sourceforge.net/project/geniusvp2/sane-backend-geniusvp2/1.0.16.1/sane-backend-geniusvp2_1.0.16.1.tar.gz
 Source15:	sane.rpmlintrc
 Patch1:		sane-backends-1.0.18-plustek-s12.patch
-Patch21:	sane-hp_rts88xx-0.18_fix_link.patch
 Patch23:	iscan-2.10.0-1_fix_link.patch
 Patch26:	iscan-2.20.1-no_non-free_please.diff
 Patch27:	iscan-2.20.1-linkage_fix.patch
@@ -95,10 +85,10 @@ BuildRequires:	jpeg-devel
 BuildRequires:	tiff-devel
 BuildRequires:	pkgconfig(gtk+-2.0)
 BuildRequires:	pkgconfig(libusb)
-%if %{gphoto2_support}
+%if %{with gphoto2}
 BuildRequires:	pkgconfig(libgphoto2)
 %endif
-%if %{v4l_support}
+%if %{with v4l}
 BuildRequires:	pkgconfig(libv4l1)
 %endif
 # ensure resmgr is not pulled
@@ -142,14 +132,14 @@ Group:		System/Kernel and hardware
 License:	LGPLv2
 Summary:	SANE - local and remote scanner access
 Provides:	%{name} = %{version}-%{release}
-%if %epkowa_support
+%if %{with epkowa}
 Suggests:	iscan
 %endif
 
 %description backends
 This package contains the backends for different scanners.
 
-%if %epkowa_support
+%if %{with epkowa}
 %package backends-iscan
 Group:		System/Kernel and hardware
 License:	LGPLv2
@@ -200,7 +190,7 @@ access image acquisition devices available on the local host.
 %patch205 -p1 -b .epson-expression800
 
 # Primax parallel port scanners
-%if %{primax_support}
+%if %{with primax}
 %setup -q -T -D -a 3 -n sane-backends-%{version}%{beta}
 %endif
 
@@ -217,7 +207,7 @@ echo '#primascan' >> backend/dll.conf.in
 autoreconf -fi
 
 # Epson Avasys driver for Epson scanners
-%if %{epkowa_support}
+%if %{with epkowa}
 %setup -q -T -D -a 13 -n sane-backends-%{version}%{beta}
 %endif
 
@@ -229,7 +219,7 @@ perl -pi -e "s@/lib(\"|\b[^/])@/%{_lib}\1@g if /LDFLAGS=.*with_ptal/" configure
 # the scanner
 perl -p -i -e 's:for \(retries = 20; retries; retries--\):for (retries = 5; retries; retries--):' backend/snapscan-scsi.c
 
-%if %epkowa_support
+%if %{with epkowa}
 pushd iscan-%{iscanversion}
 %patch23 -p0 -b .iscan-2.10.0-1_fix_link
 %patch26 -p0 -b .no_non-free_please
@@ -245,14 +235,14 @@ rm -f backend/dll.conf
 %configure2_5x \
 	--disable-static \
 	--enable-rpath=no \
-%if !%{gphoto2_support}
+%if !%{with gphoto2}
 	--without-gphoto2
 %endif
 
 %make
 
 # Primax parallel port scanners
-%if %{primax_support}
+%if %{with primax}
 chmod a+rx tools/sane-config
 cd primaxscan*
 autoreconf -fi
@@ -267,7 +257,7 @@ cd ..
 %endif
 
 # Epson Avasys driver for Epson scanners
-%if %{epkowa_support}
+%if %{with epkowa}
 chmod a+rx tools/sane-config
 PATH=`pwd`/tools:${PATH}
 cd iscan-%{iscanversion}
@@ -305,7 +295,7 @@ perl -p -i -e 's/HP\s+OfficeJet/HPLIP/g' %{buildroot}%{_sysconfdir}/sane.d/dll.c
 perl -p -i -e 's/hpoj.sf.net/hplip.sf.net/g' %{buildroot}%{_sysconfdir}/sane.d/dll.conf
 perl -p -i -e 's/hpoj/hpaio/g' %{buildroot}%{_sysconfdir}/sane.d/dll.conf
 
-%if %{empty_dll_conf}
+%if %{with empty_dll_conf}
 # The /etc/sane.d/dll.conf contains lines for every backend, so every
 # backend probes for a scanner when a SANE frontend (e. g. xsane) is
 # started. With this the user has always to wait around one minute
@@ -331,7 +321,7 @@ mv * %{buildroot}%{_docdir}/sane-backends-%{version}/
 popd
 
 # Primax parallel port scanners
-%if %{primax_support}
+%if %{with primax}
 cd primaxscan*
 %makeinstall
 rm -f %{buildroot}%{_libdir}/libsane-primax.a
@@ -341,7 +331,7 @@ cd ..
 %endif
 
 # Epson Avasys driver for Epson scanners
-%if %{epkowa_support}
+%if %{with epkowa}
 cd iscan-%{iscanversion}
 %makeinstall
 rm -f %{buildroot}%{_libdir}/sane/libsane-epkowa.a
@@ -386,7 +376,7 @@ sed -i '/^%dir/d' sane-backends.lang
 %{_bindir}/sane-find-scanner
 %{_bindir}/scanimage
 %{_bindir}/gamma4scanimage
-%if %{primax_support}
+%if %{with primax}
 %{_bindir}/primax_scan
 %endif
 %{_mandir}/man1/*
@@ -397,13 +387,13 @@ sed -i '/^%dir/d' sane-backends.lang
 %config(noreplace) %{_sysconfdir}/sane.d/*
 %{_sysconfdir}/udev/rules.d/*-libsane.rules
 %attr(1777,root,root) %dir /var/lib/lock/sane
-%if %epkowa_support
+%if %{with epkowa}
 # iscan files
 %exclude %{_sysconfdir}/sane.d/epkowa.conf
 %exclude %{_mandir}/man5/sane-epkowa.5*
 %endif
 
-%if %epkowa_support
+%if %{with epkowa}
 #-f iscan.lang
 %files backends-iscan 
 %{_libdir}/sane/libsane-epkowa.*
@@ -420,7 +410,7 @@ sed -i '/^%dir/d' sane-backends.lang
 %{_libdir}/*.so.%{major}*
 %dir %{_libdir}/sane
 %{_libdir}/sane/*.so.*
-%if %epkowa_support
+%if %{with epkowa}
 %exclude %{_libdir}/sane/libsane-epkowa.*
 %endif
 
@@ -430,7 +420,7 @@ sed -i '/^%dir/d' sane-backends.lang
 %{_libdir}/sane/*.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/sane
-%if %epkowa_support
+%if %{with epkowa}
 %exclude %{_libdir}/sane/libsane-epkowa*
 %endif