From c889185f2367d021e1a674597cc64b413752c458 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Wed, 2 Jun 2010 12:28:40 +0000
Subject: [PATCH] fix pkgconfig file (#598401)

---
 sane-backends-1.0.21-pkgconfig.patch | 33 +++++++++++++++++++++++-----
 sane-backends.spec                   |  5 ++++-
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/sane-backends-1.0.21-pkgconfig.patch b/sane-backends-1.0.21-pkgconfig.patch
index 17fa04a..0952246 100644
--- a/sane-backends-1.0.21-pkgconfig.patch
+++ b/sane-backends-1.0.21-pkgconfig.patch
@@ -1,10 +1,16 @@
-From de99bb00b0084e8a1862398270278a14e099b22b Mon Sep 17 00:00:00 2001
+From 99d33809f7c02e4ace528edc4b8b6e2bb7e762aa Mon Sep 17 00:00:00 2001
 From: Nils Philippsen <nils@redhat.com>
-Date: Wed, 5 May 2010 13:23:40 +0200
+Date: Wed, 2 Jun 2010 14:16:56 +0200
 Subject: [PATCH] patch: pkgconfig
 
 Squashed commit of the following:
 
+commit 248577ef557e36b9a326d93fd143e5e376f1a0f1
+Author: Nils Philippsen <nils@redhat.com>
+Date:   Wed Jun 2 14:14:53 2010 +0200
+
+    use ${...} instead of $(...) (#598401)
+
 commit d615848c499842c5923c3274370d2536dc650916
 Author: Nils Philippsen <nils@redhat.com>
 Date:   Fri Feb 26 17:51:14 2010 +0100
@@ -29,9 +35,10 @@ Date:   Wed May 5 10:22:15 2010 +0200
 
     use pkg-config in sane-config
 ---
- tools/Makefile.am    |   14 ++++++++++-
- tools/sane-config.in |   66 ++++++++++++++++++++++++++++++++++++++-----------
- 2 files changed, 64 insertions(+), 16 deletions(-)
+ tools/Makefile.am         |   14 +++++++++-
+ tools/sane-backends.pc.in |    6 ++--
+ tools/sane-config.in      |   66 ++++++++++++++++++++++++++++++++++----------
+ 3 files changed, 67 insertions(+), 19 deletions(-)
 
 diff --git a/tools/Makefile.am b/tools/Makefile.am
 index f52a39a..ab4e1b7 100644
@@ -72,6 +79,20 @@ index f52a39a..ab4e1b7 100644
 +
  clean-local:
  	rm -f $(HOTPLUG)
+diff --git a/tools/sane-backends.pc.in b/tools/sane-backends.pc.in
+index 5781121..b4d9731 100644
+--- a/tools/sane-backends.pc.in
++++ b/tools/sane-backends.pc.in
+@@ -9,6 +9,6 @@ Name: SANE Backends
+ Description: Backends for SANE, the universal scanner interface
+ Version: @VERSION@
+ Requires:
+-Libs: -L$(libdir) -lsane
+-Libs.private: $(ldflags) $(libs)
+-Cflags: -I$(includedir)
++Libs: -L${libdir} -lsane
++Libs.private: ${ldflags} ${libs}
++Cflags: -I${includedir}
 diff --git a/tools/sane-config.in b/tools/sane-config.in
 index 22c02b5..a9ce6fb 100644
 --- a/tools/sane-config.in
@@ -178,5 +199,5 @@ index 22c02b5..a9ce6fb 100644
      --prefix)
        echo ${prefix}
 -- 
-1.6.6.1
+1.7.0.1
 
diff --git a/sane-backends.spec b/sane-backends.spec
index ef238a8..e327abf 100644
--- a/sane-backends.spec
+++ b/sane-backends.spec
@@ -1,7 +1,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.21
-Release: 1%{?dist}
+Release: 2%{?dist}
 # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
 # Tools are GPLv2+, docs are public domain
 # see LICENSE for details
@@ -158,6 +158,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* Wed Jun 02 2010 Nils Philippsen <nils@redhat.com> - 1.0.21-2
+- fix pkgconfig file (#598401)
+
 * Wed May 05 2010 Nils Philippsen <nils@redhat.com> - 1.0.21-1
 - version 1.0.21
 - remove obsolete rpath, hal, genesys-gl841-registers patches