diff --git a/sane-backends-1.0.23-sane-config-multilib.patch b/sane-backends-1.0.23-sane-config-multilib.patch new file mode 100644 index 0000000..2f28835 --- /dev/null +++ b/sane-backends-1.0.23-sane-config-multilib.patch @@ -0,0 +1,36 @@ +From d0c61e7e9b13185f424dff1f4ac697ec53089d69 Mon Sep 17 00:00:00 2001 +From: Nils Philippsen +Date: Tue, 4 Sep 2012 16:45:14 +0200 +Subject: [PATCH] patch: sane-config-multilib + +Squashed commit of the following: + +commit 81aa4f41bf102b08258c8e1de1c0476835329ec5 +Author: Nils Philippsen +Date: Tue Sep 4 16:43:34 2012 +0200 + + make installed sane-config multi-lib aware again + + This partially reverts commit 77c4ea1a7aa680fb1c3ee4daa1404f21439b2c9b. +--- + tools/sane-config.in | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/tools/sane-config.in b/tools/sane-config.in +index 8e4b52a..1fae2e5 100644 +--- a/tools/sane-config.in ++++ b/tools/sane-config.in +@@ -10,10 +10,6 @@ scriptname="sane-config" + prefix="@prefix@" + exec_prefix="@exec_prefix@" + +-# using our installed *.pc only - neither default nor user paths +-export PKG_CONFIG_LIBDIR="@libdir@/pkgconfig" +-export PKG_CONFIG_PATH="" +- + pkgconfig_package=sane-backends + + usage () +-- +1.7.11.4 + diff --git a/sane-backends.spec b/sane-backends.spec index 222bfa2..a25b28b 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -30,6 +30,8 @@ Patch2: sane-backends-1.0.21-SCX4500W.patch # Fedora-specific (for now): don't use the same SONAME for backend libs and # main lib Patch3: sane-backends-1.0.23-soname.patch +# Fedora-specific (for now): make installed sane-config multi-lib aware again +Patch4: sane-backends-1.0.23-sane-config-multilib.patch URL: http://www.sane-project.org @@ -114,6 +116,7 @@ This package contains backend drivers to access digital cameras through SANE. %patch1 -p1 -b .epson-expression800 %patch2 -p1 -b .SCX4500W %patch3 -p1 -b .soname +%patch4 -p1 -b .sane-config-multilib %build %if ! 0%{?_hardened_build} @@ -191,6 +194,9 @@ install -m 0644 tools/sane-backends.pc %{buildroot}%{_libdir}/pkgconfig/ %{_libdir}/sane/*gphoto2.so.* %changelog +* Tue Sep 04 2012 Nils Philippsen - 1.0.23-2 +- make installed sane-config multi-lib aware again + * Fri Aug 31 2012 Nils Philippsen - 1.0.23-1 - version 1.0.23 - update udev patch, remove obsolete patches