rpms/sane-backends/devel sane-backends-1.0.19-pkgconfig.patch, 1.1, 1.2 sane-backends.spec, 1.114, 1.115
Nils Philippsen
nphilipp at fedoraproject.org
Fri Feb 27 15:12:32 UTC 2009
Author: nphilipp
Update of /cvs/pkgs/rpms/sane-backends/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29149
Modified Files:
sane-backends-1.0.19-pkgconfig.patch sane-backends.spec
Log Message:
fix pkgconfig files
sane-backends-1.0.19-pkgconfig.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 sane-backends-1.0.19-pkgconfig.patch
Index: sane-backends-1.0.19-pkgconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/devel/sane-backends-1.0.19-pkgconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sane-backends-1.0.19-pkgconfig.patch 7 Feb 2008 10:11:41 -0000 1.1
+++ sane-backends-1.0.19-pkgconfig.patch 27 Feb 2009 15:12:02 -0000 1.2
@@ -1,169 +1,18000 @@
-diff -U0 sane-backends-20080206/ChangeLog.pkgconfig sane-backends-20080206/ChangeLog
---- sane-backends-20080206/ChangeLog.pkgconfig 2008-02-04 02:20:01.000000000 +0100
-+++ sane-backends-20080206/ChangeLog 2008-02-06 11:49:41.000000000 +0100
-@@ -0,0 +1,7 @@
-+2006-05-16 Nils Philippsen <nphilipp at redhat.com>
-+
-+ * acinclude.m4 configure.in tools/sane-config.in
-+ tools/sane-backends.pc.in tools/Makefile.in: add pkg-config support,
-+ re-write sane-config to use pkg-config to avoid multilib problems with
-+ conflicting sane-config scripts
-+
-diff -up sane-backends-20080206/acinclude.m4.pkgconfig sane-backends-20080206/acinclude.m4
---- sane-backends-20080206/acinclude.m4.pkgconfig 2007-11-10 08:12:54.000000000 +0100
-+++ sane-backends-20080206/acinclude.m4 2008-02-06 11:49:41.000000000 +0100
-@@ -194,6 +194,7 @@ unset param
- # Checks for ieee1284 library, needed for canon_pp backend.
- AC_DEFUN([SANE_CHECK_IEEE1284],
- [
-+ AC_SUBST(IEEE1284_LIBS)
- AC_CHECK_HEADER(ieee1284.h, [
- AC_CACHE_CHECK([for libieee1284 >= 0.1.5], sane_cv_use_libieee1284, [
- AC_TRY_COMPILE([#include <ieee1284.h>], [
-@@ -206,6 +207,7 @@ AC_DEFUN([SANE_CHECK_IEEE1284],
- ],)
- if test "$sane_cv_use_libieee1284" = "yes" ; then
- AC_DEFINE(HAVE_LIBIEEE1284,1,[Define to 1 if you have the `ieee1284' library (-lcam).])
-+ AC_SUBST(IEEE1284_LIBS, "-lieee1284")
- fi
- ])
-
-@@ -213,6 +215,7 @@ AC_DEFUN([SANE_CHECK_IEEE1284],
- # Checks for pthread support
- AC_DEFUN([SANE_CHECK_PTHREAD],
- [
-+ AC_SUBST(PTHREAD_LIBS)
+diff -up sane-backends-1.0.19/aclocal.m4.pkgconfig sane-backends-1.0.19/aclocal.m4
+--- sane-backends-1.0.19/aclocal.m4.pkgconfig 2007-11-10 08:12:54.000000000 +0100
++++ sane-backends-1.0.19/aclocal.m4 2009-02-27 15:09:25.172944059 +0100
+@@ -1,7 +1,7 @@
+-# generated automatically by aclocal 1.10 -*- Autoconf -*-
++# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005, 2006 Free Software Foundation, Inc.
++# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -11,4 +11,160 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+
++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
++#
++# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# PKG_PROG_PKG_CONFIG([MIN-VERSION])
++# ----------------------------------
++AC_DEFUN([PKG_PROG_PKG_CONFIG],
++[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
++m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
++fi
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=m4_default([$1], [0.9.0])
++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_RESULT([no])
++ PKG_CONFIG=""
++ fi
++
++fi[]dnl
++])# PKG_PROG_PKG_CONFIG
++
++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
++#
++# Check to see whether a particular set of modules exists. Similar
++# to PKG_CHECK_MODULES(), but does not set variables or print errors.
++#
++#
++# Similar to PKG_CHECK_MODULES, make sure that the first instance of
++# this or PKG_CHECK_MODULES is called, or make sure to call
++# PKG_CHECK_EXISTS manually
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_EXISTS],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++if test -n "$PKG_CONFIG" && \
++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
++ m4_ifval([$2], [$2], [:])
++m4_ifvaln([$3], [else
++ $3])dnl
++fi])
++
++
++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
++# ---------------------------------------------
++m4_define([_PKG_CONFIG],
++[if test -n "$$1"; then
++ pkg_cv_[]$1="$$1"
++ elif test -n "$PKG_CONFIG"; then
++ PKG_CHECK_EXISTS([$3],
++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
++ [pkg_failed=yes])
++ else
++ pkg_failed=untried
++fi[]dnl
++])# _PKG_CONFIG
++
++# _PKG_SHORT_ERRORS_SUPPORTED
++# -----------------------------
++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi[]dnl
++])# _PKG_SHORT_ERRORS_SUPPORTED
++
++
++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
++# [ACTION-IF-NOT-FOUND])
++#
++#
++# Note that if there is a possibility the first call to
++# PKG_CHECK_MODULES might not happen, you should be sure to include an
++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
++#
++#
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_MODULES],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
++
++pkg_failed=no
++AC_MSG_CHECKING([for $1])
++
++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
++_PKG_CONFIG([$1][_LIBS], [libs], [$2])
++
++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
++and $1[]_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.])
++
++if test $pkg_failed = yes; then
++ _PKG_SHORT_ERRORS_SUPPORTED
++ if test $_pkg_short_errors_supported = yes; then
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
++ else
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
++
++ ifelse([$4], , [AC_MSG_ERROR(dnl
++[Package requirements ($2) were not met:
++
++$$1_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++_PKG_TEXT
++])],
++ [AC_MSG_RESULT([no])
++ $4])
++elif test $pkg_failed = untried; then
[...17864 lines suppressed...]
++ alias -g '\${1+\"\$@\"}'='\"\$@\"'
++ setopt NO_GLOB_SUBST
++else
++ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
++
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+@@ -5423,7 +5484,7 @@ else
+ ;;
+ esac
+ $echo >> $output "\
+- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
++ \$echo \"\$0: cannot exec \$program \$*\"
+ exit $EXIT_FAILURE
+ fi
+ else
+@@ -5609,7 +5670,7 @@ fi\
+ done
+ # Quote the link command for shipping.
+ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+ if test "$hardcode_automatic" = yes ; then
+ relink_command=
+ fi
+@@ -5954,9 +6015,9 @@ relink_command=\"$relink_command\""
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
+- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
+ else
+- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
++ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
+ fi
+
+ $echo "$modename: warning: relinking \`$file'" 1>&2
+@@ -6165,7 +6226,7 @@ relink_command=\"$relink_command\""
+ file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
+ outputname="$tmpdir/$file"
+ # Replace the output file specification.
+- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
+
+ $show "$relink_command"
+ if $run eval "$relink_command"; then :
+@@ -6376,9 +6437,11 @@ relink_command=\"$relink_command\""
+ if test -f "$dir/$objdir/$dlname"; then
+ dir="$dir/$objdir"
+ else
++ if test ! -f "$dir/$dlname"; then
+ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+ exit $EXIT_FAILURE
+ fi
++ fi
+ ;;
+
+ *.lo)
+@@ -6441,12 +6504,12 @@ relink_command=\"$relink_command\""
+ fi
+
+ # Restore saved environment variables
+- if test "${save_LC_ALL+set}" = set; then
+- LC_ALL="$save_LC_ALL"; export LC_ALL
+- fi
+- if test "${save_LANG+set}" = set; then
+- LANG="$save_LANG"; export LANG
+- fi
++ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++ do
++ eval "if test \"\${save_$lt_var+set}\" = set; then
++ $lt_var=\$save_$lt_var; export $lt_var
++ fi"
++ done
+
+ # Now prepare to actually exec the command.
+ exec_cmd="\$cmd$args"
+@@ -6819,7 +6882,9 @@ The following components of LINK-COMMAND
+ -release RELEASE specify package release information
+ -rpath LIBDIR the created library will eventually be installed in LIBDIR
+ -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
+- -static do not do any dynamic linking of libtool libraries
++ -static do not do any dynamic linking of uninstalled libtool libraries
++ -static-libtool-libs
++ do not do any dynamic linking of libtool libraries
+ -version-info CURRENT[:REVISION[:AGE]]
+ specify library version info [each variable defaults to 0]
+
+diff -up sane-backends-1.0.19/tools/Makefile.in.pkgconfig sane-backends-1.0.19/tools/Makefile.in
+--- sane-backends-1.0.19/tools/Makefile.in.pkgconfig 2008-02-03 07:59:36.000000000 +0100
++++ sane-backends-1.0.19/tools/Makefile.in 2009-02-27 16:03:10.263945967 +0100
@@ -26,6 +26,7 @@ mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
@@ -209,83 +18040,21 @@
sane-find-scanner: sane-find-scanner.o check-usb-chip.o ../backend/sane_strstatus.lo \
../sanei/sanei_scsi.lo ../sanei/sanei_usb.lo ../sanei/sanei_init_debug.lo \
../sanei/sanei_config.lo
-diff -up sane-backends-20080206/configure.in.pkgconfig sane-backends-20080206/configure.in
---- sane-backends-20080206/configure.in.pkgconfig 2008-02-02 13:20:45.000000000 +0100
-+++ sane-backends-20080206/configure.in 2008-02-06 11:49:41.000000000 +0100
-@@ -52,6 +52,7 @@ AC_PROG_INSTALL
- AC_PROG_MAKE_SET
- AC_PROG_CPP
- AC_PROG_GCC_TRADITIONAL
-+PKG_PROG_PKG_CONFIG
- AC_PATH_PROG(SANE_CONFIG_PATH, sane-config, no)
- AC_PATH_PROG(MSGFMT, msgfmt$EXEEXT, no)
- AC_PATH_PROG(XGETTEXT, xgettext$EXEEXT, no)
-@@ -99,6 +100,8 @@ dnl Checks for libraries
- dnl ***********************************************************************
- SANE_CHECK_DLL_LIB
- dnl Checks for Backend libraries.
-+_pc_libs_save="$LIBS"
-+LIBS=""
- AC_CHECK_LIB(m,sqrt)
- AC_CHECK_LIB(scsi, scsireq_enter) # FreeBSD needs this
- AC_CHECK_LIB(cam, cam_open_device) # FreeBSD 3+ needs this
-@@ -109,6 +112,8 @@ if test "`uname`" != "IRIX" -a "`uname`"
- AC_SEARCH_LIBS(socket, socket)
- AC_SEARCH_LIBS(syslog, syslog be) # OS/2 needs -lsyslog, BeOS needs -lbe
- fi
-+AC_SUBST(PC_LIBS, "$LIBS")
-+LIBS="$LIBS $_pc_libs_save"
- SANE_CHECK_JPEG
- SANE_CHECK_TIFF
- SANE_CHECK_IEEE1284
-@@ -139,19 +144,23 @@ AC_CHECK_HEADERS([io/cam/cam.h],,,[#incl
-
- SANE_CHECK_MISSING_HEADERS
-
-+AC_SUBST(RESMGR_LIBS)
- AC_CHECK_HEADER(resmgr.h,[
- AC_CHECK_LIB(
- resmgr,
- rsm_open_device,[
- AC_DEFINE(HAVE_RESMGR,1,[define if you have the resmgr library])
- LIBS="$LIBS -lresmgr"
-+ AC_SUBST(RESMGR_LIBS, "-lresmgr")
- ]
- )
- ])
-
-+AC_SUBST(USBCALLS_LIBS)
- AC_CHECK_HEADER(usbcalls.h,[
- AC_DEFINE(HAVE_USBCALLS,1,[define if you have the usbcalls library])
- LIBS="$LIBS -lusbcalls"
-+ AC_SUBST(USBCALLS_LIBS, "-lusbcalls")
- ],,[
- #include <usb.h>
- #include <os2.h>])
-@@ -279,6 +288,7 @@ if test -c /dev/urandom ; then
- fi
-
- dnl libusb on enabled by default (if found)
-+AC_SUBST(PC_REQS)
- USE_LIBUSB=yes
- AC_ARG_ENABLE(libusb,
- AC_HELP_STRING([--disable-libusb],
-@@ -294,6 +304,10 @@ if test "${ac_cv_header_usb_h}" = "yes"
- AC_CHECK_LIB(usb, usb_interrupt_read)
- if test "${ac_cv_lib_usb_usb_interrupt_read}" = "yes" ; then
- HAVE_LIBUSB="yes"
-+ PKG_CHECK_MODULES(LIBUSB, libusb)
-+ if test "${LIBUSB_LIBS}"; then
-+ AC_SUBST(PC_REQS, "libusb $PC_REQS")
-+ fi
- fi
- fi
-
-@@ -560,6 +574,7 @@ AC_CONFIG_FILES([Makefile lib/Makefile s
- japi/Makefile backend/Makefile include/Makefile doc/Makefile \
- po/Makefile testsuite/Makefile tools/Makefile doc/doxygen-sanei.conf])
- AC_CONFIG_FILES([tools/sane-config], [chmod a+x tools/sane-config])
-+AC_CONFIG_FILES([tools/sane-backends.pc])
- AC_OUTPUT
-
- dnl ***********************************************************************
+diff -up /dev/null sane-backends-1.0.19/tools/sane-backends.pc.in
+--- /dev/null 2009-02-26 11:12:15.483210364 +0100
++++ sane-backends-1.0.19/tools/sane-backends.pc.in 2009-02-27 15:09:25.209976117 +0100
+@@ -0,0 +1,14 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++pc_libs=@RESMGR_LIBS@ @DL_LIB@ @IEEE1284_LIBS@ @PTHREAD_LIBS@ @JPEG_LIBS@ @PC_LIBS@
++pc_reqs=@PC_REQS@
++
++Name: SANE Backends
++Description: Backends for SANE, the universal scanner interface
++Version: @VERSION@
++Requires: ${pc_reqs}
++Libs: -L${libdir} -lsane ${pc_libs}
++Cflags:
Index: sane-backends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- sane-backends.spec 25 Feb 2009 11:42:32 -0000 1.114
+++ sane-backends.spec 27 Feb 2009 15:12:02 -0000 1.115
@@ -1,7 +1,7 @@
Summary: Scanner access software
Name: sane-backends
Version: 1.0.19
-Release: 13%{?dist}
+Release: 14%{?dist}
# lib/ is LGPLv2+, backends are GPLv2+ with exceptions
# Tools are GPLv2+, docs are public domain
# see LICENSE for details
@@ -155,6 +155,9 @@
%{_libdir}/pkgconfig/sane-backends.pc
%changelog
+* Fri Feb 27 2009 Nils Philippsen <nils at redhat.com> - 1.0.19-14
+- fix pkgconfig files
+
* Wed Feb 25 2009 Nils Philippsen <nils at redhat.com> - 1.0.19-13
- drop acinclude patch to not unnecessarily rebuild autoconf/libtool files
which made libtool break builds on Rawhide
More information about the fedora-extras-commits
mailing list