rpms/sane-backends/devel sane-backends-1.0.17-pkgconfig.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: nphilipp

Update of /cvs/dist/rpms/sane-backends/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4314

Modified Files:
	sane-backends-1.0.17-pkgconfig.patch 
Log Message:
fix autoconf macro bug
add exec_prefix to .pc file


sane-backends-1.0.17-pkgconfig.patch:
 ChangeLog                 |    7 +++++++
 acinclude.m4              |    9 ++++++++-
 configure.in              |   15 +++++++++++++++
 tools/Makefile.in         |   11 +++++++++--
 tools/sane-backends.pc.in |   14 ++++++++++++++
 tools/sane-config.in      |   40 +++-------------------------------------
 6 files changed, 56 insertions(+), 40 deletions(-)

Index: sane-backends-1.0.17-pkgconfig.patch
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/devel/sane-backends-1.0.17-pkgconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sane-backends-1.0.17-pkgconfig.patch	16 May 2006 16:24:14 -0000	1.1
+++ sane-backends-1.0.17-pkgconfig.patch	16 May 2006 16:40:51 -0000	1.2
@@ -1,5 +1,5 @@
 --- sane-backends-1.0.17/ChangeLog.pkgconfig	2005-12-18 15:41:09.000000000 +0100
-+++ sane-backends-1.0.17/ChangeLog	2006-05-16 18:22:07.000000000 +0200
++++ sane-backends-1.0.17/ChangeLog	2006-05-16 18:31:17.000000000 +0200
 @@ -0,0 +1,7 @@
 +2006-05-16  Nils Philippsen <nphilipp at redhat.com>
 +
@@ -8,8 +8,8 @@
 +	re-write sane-config to use pkg-config to avoid multilib problems with
 +	conflicting sane-config scripts
 +
---- sane-backends-1.0.17/acinclude.m4.pkgconfig	2006-05-15 17:05:18.000000000 +0200
-+++ sane-backends-1.0.17/acinclude.m4	2006-05-16 17:31:37.000000000 +0200
+--- sane-backends-1.0.17/acinclude.m4.pkgconfig	2006-05-16 18:38:02.000000000 +0200
++++ sane-backends-1.0.17/acinclude.m4	2006-05-16 18:31:18.000000000 +0200
 @@ -194,6 +194,7 @@
  # Checks for ieee1284 library, needed for canon_pp backend.
  AC_DEFUN([SANE_CHECK_IEEE1284],
@@ -55,7 +55,7 @@
          #endif
        ],[sane_cv_use_libjpeg="yes"; LIBS="${LIBS} -ljpeg"; 
 -      AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
-+      AC_SUBST(JPEG_LIBS, "-ljpeg"); AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
++      AC_SUBST(JPEG_LIBS, "-ljpeg") AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
      ],)
    ],)
  ])
@@ -76,7 +76,7 @@
  			 	saved_LIBS="${LIBS}"
  				LIBS="${LIBS} ${GPHOTO2_LIBS}"
 --- sane-backends-1.0.17/configure.in.pkgconfig	2005-12-18 14:15:15.000000000 +0100
-+++ sane-backends-1.0.17/configure.in	2006-05-16 17:43:53.000000000 +0200
++++ sane-backends-1.0.17/configure.in	2006-05-16 18:31:17.000000000 +0200
 @@ -52,6 +52,7 @@
  AC_PROG_MAKE_SET
  AC_PROG_CPP
@@ -154,8 +154,8 @@
  AC_OUTPUT
  
  dnl ***********************************************************************
---- sane-backends-1.0.17/tools/sane-config.in.pkgconfig	2006-05-15 17:05:17.000000000 +0200
-+++ sane-backends-1.0.17/tools/sane-config.in	2006-05-16 18:14:26.000000000 +0200
+--- sane-backends-1.0.17/tools/sane-config.in.pkgconfig	2006-05-16 18:31:17.000000000 +0200
++++ sane-backends-1.0.17/tools/sane-config.in	2006-05-16 18:31:17.000000000 +0200
 @@ -7,30 +7,10 @@
  PACKAGE="@PACKAGE@"
  scriptname="sane-config"
@@ -218,10 +218,11 @@
        ;;
      --prefix)
        echo ${prefix}
---- sane-backends-1.0.17/tools/sane-backends.pc.in.pkgconfig	2006-05-15 17:37:54.000000000 +0200
-+++ sane-backends-1.0.17/tools/sane-backends.pc.in	2006-05-16 17:44:05.000000000 +0200
-@@ -0,0 +1,13 @@
+--- /dev/null	2006-05-15 11:22:36.323023750 +0200
++++ sane-backends-1.0.17/tools/sane-backends.pc.in	2006-05-16 18:33:43.000000000 +0200
+@@ -0,0 +1,14 @@
 +prefix=@prefix@
++exec_prefix=@exec_prefix@
 +libdir=@libdir@
 +includedir=@includedir@
 +
@@ -235,7 +236,7 @@
 +Libs: -L${libdir} -lsane ${pc_libs}
 +Cflags:
 --- sane-backends-1.0.17/tools/Makefile.in.pkgconfig	2005-10-29 16:41:09.000000000 +0200
-+++ sane-backends-1.0.17/tools/Makefile.in	2006-05-16 17:46:46.000000000 +0200
++++ sane-backends-1.0.17/tools/Makefile.in	2006-05-16 18:31:17.000000000 +0200
 @@ -25,6 +25,7 @@
  includedir = @includedir@
  oldincludedir = /usr/include