rpms/xdelta/devel xdelta-1.1.3-pkgconfig.patch, NONE, 1.1 xdelta.spec, 1.21, 1.22

Tue May 30 14:19:04 UTC 2006

Author: lsmid

Update of /cvs/dist/rpms/xdelta/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31396

Modified Files:
	xdelta.spec 
Added Files:
	xdelta-1.1.3-pkgconfig.patch 
Log Message:
- resolved multilib conflict using pkgconfig tool


xdelta-1.1.3-pkgconfig.patch:
 Makefile.am   |    3 ++
 configure.in  |    4 ++-
 xdelta-config |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 xdelta.pc.in  |   13 ++++++++++++
 4 files changed, 79 insertions(+), 1 deletion(-)

--- NEW FILE xdelta-1.1.3-pkgconfig.patch ---
--- /dev/null	2006-05-17 14:47:01.398050000 +0200
+++ xdelta-1.1.3/xdelta.pc.in	2006-05-30 16:00:55.000000000 +0200
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+pkgdatadir=@pkgdatadir@
+
+Name: xdelta
+Description: A binary file delta generator and an RCS replacement library.
+Version: @VERSION@
+Requires:
+Libs: -L${libdir} -lxdelta -ledsio
+Cflags: -I${includedir}
+
--- /dev/null	2006-05-17 14:47:01.398050000 +0200
+++ xdelta-1.1.3/xdelta-config	2006-05-30 16:04:22.000000000 +0200
@@ -0,0 +1,60 @@
+#!/bin/bash
+#
+# Simple wrapper around pkg-config to replace /usr/bin/<foo>-config scripts
+# 
+# Copyright 2006 Red Hat, Inc.  
+# Jeremy Katz <katzj at redhat.com>
+
+CFGPATH=$(basename $0)
+MODULE=${CFGPATH%-config}
+
+usage() {
+    pkg-config --help
+    exit 1
+}
+
+if [ $# -lt 1 ]; then
+    usage 1>&2
+fi
+
+ARGS=""
+
+while test $# -gt 0; do
+  case $1 in 
+      --version)
+	  ARGS="$ARGS --modversion"
+	  ;;
+      --cflags)
+	  ARGS="$ARGS --cflags"
+	  ;;
+      --libs)
+	  ARGS="$ARGS --libs"
+	  ;;
+      --libdir*)
+	  ARGS="$ARGS --libs-only-L"
+	  ;;
+      --includedir*)
+	  ARGS="$ARGS --cflags-only-I"
+	  ;;
+      --prefix*)
+          ARGS="$ARGS --variable=prefix"
+          ;;
+      --exec-prefix*)
+          ARGS="$ARGS --variable=exec_prefix"
+          ;;
+      --module*)
+	  if echo $1 | grep -q '=' ; then
+	      MODULE=`echo $1 | sed 's/^--module=//'`
+	  else
+	      MODULE=$2
+	      shift
+	  fi
+	  ;;
+      *)
+	  usage 1>&2
+	  ;;
+  esac
+  shift
+done
+
+pkg-config $ARGS $MODULE
--- xdelta-1.1.3/Makefile.am.pkgconfig	2006-05-30 16:00:55.000000000 +0200
+++ xdelta-1.1.3/Makefile.am	2006-05-30 16:00:55.000000000 +0200
@@ -27,6 +27,9 @@
 m4datadir = $(datadir)/aclocal
 m4data_DATA = xdelta.m4
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = xdelta.pc
+
 ## $Format: "libxdelta_la_LDFLAGS = -version-info $LibCurrent$:$LibRevision$:$LibAge$" $
 libxdelta_la_LDFLAGS = -version-info 2:0:0
 
--- xdelta-1.1.3/configure.in.pkgconfig	2006-05-30 16:00:55.000000000 +0200
+++ xdelta-1.1.3/configure.in	2006-05-30 16:00:55.000000000 +0200
@@ -63,6 +63,8 @@
 AC_HEADER_STDC
 AC_PROG_MAKE_SET
 
+PKG_PROG_PKG_CONFIG
+
 AC_CHECK_FUNCS(gettimeofday)
 AC_HEADER_TIME
 
@@ -83,7 +85,7 @@
 	  doc/Makefile
           test/Makefile
           djgpp/Makefile
-	  xdelta-config
+	  xdelta.pc
 	  libedsio/Makefile
 	  libedsio/edsio-comp,
 


Index: xdelta.spec
===================================================================
RCS file: /cvs/dist/rpms/xdelta/devel/xdelta.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xdelta.spec	30 May 2006 08:21:49 -0000	1.21
+++ xdelta.spec	30 May 2006 14:19:01 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: A binary file delta generator and an RCS replacement library.
 Name: xdelta
 Version: 1.1.3
-Release: 18
+Release: 19
 License: GPL
 Group: Development/Tools
 Source: http://prdownloads.sourceforge.net/xdelta/xdelta-%{version}.tar.gz
@@ -11,8 +11,9 @@
 Patch3: xdelta-1.1.3-edsio.patch
 Patch4: xdelta-1.1.3-glib2.patch
 Patch5: xdelta-1.1.3-allocbug.patch
+Patch6: xdelta-1.1.3-pkgconfig.patch
 Url: http://sourceforge.net/projects/xdelta/
-BuildRequires: glib2-devel, zlib-devel, libtool >= 1.5.22, automake >= 1.9.6, autoconf >= 2.59
+BuildRequires: glib2-devel, zlib-devel, libtool >= 1.5.22, automake >= 1.9.6, autoconf >= 2.59, pkgconfig
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -41,6 +42,7 @@
 %patch3 -p1 -b .edsio
 %patch4 -p1 -b .glib2
 %patch5 -p1 -b .allocbug
+%patch6 -p1 -b .pkgconfig
 
 %build
 # generate build files
@@ -81,10 +83,12 @@
 %{_libdir}/lib*.a
 %{_libdir}/lib*.so
 %{_datadir}/aclocal/xdelta.m4
+%{_libdir}/pkgconfig/*
 
 %changelog
-* Mon May 29 2006 Ludek Smid <lsmid at redhat.com> 1.1.3-19
+* Tue May 30 2006 Ludek Smid <lsmid at redhat.com> 1.1.3-19
 - libtoolize and autotools are now run during build phase
+- resolved multilib conflict using pkgconfig tool
 
 * Fri May 05 2006 Ludek Smid <lsmid at redhat.com> 1.1.3-18
 - patches created on i386 fail to apply on x86_64 (#190406)


