- replaced *-config scripts with calls to pkg-config to solve multilib

conflicts

gnutls.spec

@@ -1,7 +1,7 @@
 Summary: A TLS protocol implementation.
 Name: gnutls
 Version: 1.2.9
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 BuildPrereq: libgcrypt-devel >= 1.2.2
@@ -12,6 +12,7 @@ URL: http://www.gnutls.org/
 #Source1: ftp://ftp.gnutls.org/pub/gnutls/devel/%{name}-%{version}.tar.gz.sig
 # XXX patent tainted SRP code removed.
 Source0: %{name}-%{version}-nosrp.tar.bz2
+Source1: libgnutls-config
 Patch0: gnutls-1.2.9-nosrp.patch
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: libgcrypt >= 1.2.2
@@ -62,12 +63,14 @@ make
 %install
 rm -fr $RPM_BUILD_ROOT
 %makeinstall
-rm -f $RPM_BUILD_ROOT/%{_bindir}/srptool
-rm -f $RPM_BUILD_ROOT/%{_bindir}/gnutls-srpcrypt
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/srptool.1
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/*srp*
-rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_bindir}/srptool
+rm -f $RPM_BUILD_ROOT%{_bindir}/gnutls-srpcrypt
+cp -f %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/libgnutls-config
+cp -f %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/libgnutls-extra-config
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/srptool.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*srp*
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %check
 make check
@@ -95,7 +98,7 @@ fi
 
 %files devel
 %defattr(-,root,root)
-%{_bindir}/libgnutls*
+%{_bindir}/libgnutls*-config
 %{_includedir}/*
 %{_libdir}/*.a
 %{_libdir}/*.so
@@ -111,6 +114,10 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Fri Dec  9 2005 Tomas Mraz <tmraz@redhat.com> 1.2.9-2
+- replaced *-config scripts with calls to pkg-config to
+  solve multilib conflicts
+
 * Wed Nov 23 2005 Tomas Mraz <tmraz@redhat.com> 1.2.9-1
 - upgrade to newest upstream
 - removed .la files (#172635)

libgnutls-config

@@ -0,0 +1,91 @@
+#!/bin/sh
+
+prefix=/usr
+exec_prefix=/usr
+exec_prefix_set=no
+
+name=`basename $0`
+name=${name#lib}
+name=${name%-config}
+
+libs=`pkg-config --libs $name`
+cflags=`pkg-config --cflags $name`
+version=`pkg-config --modversion $name`
+
+usage()
+{
+
+echo Usage: lib$name-config [OPTIONS]
+	cat <<EOF
+Options:
+	[--prefix[=DIR]]
+	[--exec-prefix[=DIR]]
+	[--version]
+	[--libs]
+	[--cflags]
+EOF
+	exit $1
+}
+
+if test $# -eq 0; then
+	usage 1 1>&2
+fi
+
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  case $1 in
+    --prefix=*)
+      prefix=$optarg
+      if test $exec_prefix_set = no ; then
+	exec_prefix=$optarg
+      fi
+      ;;
+    --prefix)
+      echo_prefix=yes
+      ;;
+    --exec-prefix=*)
+      exec_prefix=$optarg
+      exec_prefix_set=yes
+      ;;
+    --exec-prefix)
+      echo_exec_prefix=yes
+      ;;
+    --version)
+      echo $version
+      exit 0
+      ;;
+    --cflags)
+      echo_cflags=yes
+      ;;
+    --libs)
+      echo_libs=yes
+      ;;
+    --help)
+      usage 0
+      ;;
+    *)
+      usage 1 1>&2
+      ;;
+  esac
+  shift
+done
+
+if test "$echo_prefix" = "yes"; then
+    echo $prefix
+fi
+
+if test "$echo_exec_prefix" = "yes"; then
+    echo $exec_prefix
+fi
+
+if test "$echo_cflags" = "yes"; then
+    echo $cflags
+fi
+
+if test "$echo_libs" = "yes"; then
+    echo $libs
+fi