rpms/sane-backends/F-10 sane-backends-1.0.20-pkgconfig.patch, 1.1, 1.2 sane-backends.spec, 1.115, 1.116

[Nils Philippsen]

Author: nphilipp

Update of /cvs/pkgs/rpms/sane-backends/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10749

Modified Files:
	sane-backends-1.0.20-pkgconfig.patch sane-backends.spec 
Log Message:
make sane-config multilib-aware

sane-backends-1.0.20-pkgconfig.patch:

Index: sane-backends-1.0.20-pkgconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/F-10/sane-backends-1.0.20-pkgconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sane-backends-1.0.20-pkgconfig.patch	17 Jun 2009 08:53:11 -0000	1.1
+++ sane-backends-1.0.20-pkgconfig.patch	17 Jun 2009 11:17:04 -0000	1.2
@@ -1,11 +1,17 @@
-commit c230f04bf3590fbfcd4aaa529e9f10eb0478379c
+commit e4a01aa9f45cd2420bed7a9131a6d0044c182a05
 Author: Nils Philippsen <nils at redhat.com>
-Date:   Tue Jun 16 17:02:26 2009 +0200
+Date:   Wed Jun 17 13:10:47 2009 +0200
 
     patch: pkgconfig
     
     Squashed commit of the following:
     
+    commit 52ef5f47ccc0128c78ab3ad38ac7b7918dd7ac88
+    Author: Nils Philippsen <nils at redhat.com>
+    Date:   Wed Jun 17 13:09:51 2009 +0200
+    
+        make sane-config multilib-aware on Linux
+    
     commit 7787640dd567b93dd0a458fd5fb662bb7b85ff36
     Author: Nils Philippsen <nils at redhat.com>
     Date:   Fri Jun 5 12:55:39 2009 +0200
@@ -90,23 +96,50 @@ index 0000000..fb64e3b
 +Libs: -L${libdir} -lsane ${pc_libs}
 +Cflags:
 diff --git a/tools/sane-config.in b/tools/sane-config.in
-index 85add1a..9e5a2fc 100644
+index 85add1a..c0450d4 100644
 --- a/tools/sane-config.in
 +++ b/tools/sane-config.in
-@@ -32,6 +32,12 @@ srcdir="@srcdir@"
+@@ -18,7 +18,7 @@ pkglibdir="@pkglibdir@"
+ includedir="@includedir@"
+ mandir="@mandir@"
+ infodir="@infodir@"
+-libdir="@libdir@"
++#libdir=
+ localstatedir="@localstatedir@"
+ sysconfdir="@sysconfdir@"
+ datarootdir="@datarootdir@"
+@@ -32,6 +32,30 @@ srcdir="@srcdir@"
  top_srcdir="@top_srcdir@"
  cflags=
  
 +pkgconfig_package=sane-backends
 +use_pkgconfig=0
-+if test -x "@bindir@/pkg-config" -a "@bindir@/pkg-config" --exists "$pkgconfig_package"
++if test -x "@bindir@/pkg-config" && "@bindir@/pkg-config" --exists "$pkgconfig_package"; then
 +    use_pkgconfig=1
++else
++    libdir=
++    if kernel="`uname -s 2>/dev/null`"; then
++        case "$kernel" in
++            Linux)
++            if hw="`uname -i 2>/dev/null`"; then
++                case "$hw" in
++                    *64)
++                    libdir="@exec_prefix@/lib64"
++                    ;;
++                esac
++            fi
++            ;;
++        esac
++    fi
++    if test "x$libdir" = "x"; then
++        libdir="@exec_prefix@/lib"
++    fi
 +fi
 +
  usage ()
  {
    echo "Usage: "  1>&2
-@@ -85,26 +91,38 @@ if test $# -gt 0; then
+@@ -85,26 +109,38 @@ if test $# -gt 0; then
        ;;
      --ldflags)
  


Index: sane-backends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/F-10/sane-backends.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- sane-backends.spec	17 Jun 2009 09:35:46 -0000	1.115
+++ sane-backends.spec	17 Jun 2009 11:17:04 -0000	1.116
@@ -1,7 +1,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.20
-Release: 2%{?dist}
+Release: 3%{?dist}
 # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
 # Tools are GPLv2+, docs are public domain
 # see LICENSE for details
@@ -88,7 +88,8 @@ want to access digital cameras.
 %build
 %configure \
     --with-gphoto2=%{_prefix} \
-    --with-docdir=%{_docdir}/%{name}-%{version}
+    --with-docdir=%{_docdir}/%{name}-%{version} \
+    --disable-rpath
 make %{?_smp_mflags}
 
 
@@ -153,6 +154,10 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* Wed Jun 17 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-3
+- disable rpath
+- make sane-config multilib-aware
+
 * Wed Jun 17 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-2
 - fix permissions for Epson Expression 800 (#456656)