From 10f97438276604c5cd2c0ae1f076aeaf08f59fde Mon Sep 17 00:00:00 2001 From: Caolan McNamara Date: May 23 2006 07:37:22 +0000 Subject: rh#192669# fribidi-config on pkg-config --- diff --git a/fribidi-0.10.7-multiarchdevel.patch b/fribidi-0.10.7-multiarchdevel.patch index 20cd47d..c5c8394 100644 --- a/fribidi-0.10.7-multiarchdevel.patch +++ b/fribidi-0.10.7-multiarchdevel.patch @@ -45,3 +45,95 @@ fribidi_mem.h GETOPT_SRC = \ +--- fribidi-0.10.7.orig/configure.in 2006-05-02 10:52:33.000000000 +0100 ++++ fribidi-0.10.7/configure.in 2006-05-23 08:29:08.000000000 +0100 +@@ -199,7 +199,6 @@ + AC_OUTPUT([ + Makefile + fribidi_config.h +-fribidi-config + fribidi.pc + fribidi.spec + ],[case "$CONFIG_FILES" in +--- /dev/null 2006-05-21 20:51:02.793468250 +0100 ++++ fribidi-0.10.7/fribidi-config 2006-05-23 08:28:36.000000000 +0100 +@@ -0,0 +1,79 @@ ++#!/bin/sh ++ ++prefix=`pkg-config --variable prefix fribidi` ++exec_prefix=`pkg-config --variable exec_prefix fribidi` ++exec_prefix_set=no ++ ++usage() ++{ ++ cat <&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) ++ pkg-config --modversion fribidi ++ ;; ++ --cflags) ++ echo_cflags=yes ++ ;; ++ --libs) ++ echo_libs=yes ++ ;; ++ *) ++ 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 ++ pkg-config --cflags fribidi ++fi ++ ++if test "$echo_libs" = "yes"; then ++ pkg-config --libs fribidi ++fi ++ diff --git a/fribidi.spec b/fribidi.spec index 5190626..ca193e4 100644 --- a/fribidi.spec +++ b/fribidi.spec @@ -1,7 +1,7 @@ Summary: Library implementing the Unicode Bidirectional Algorithm Name: fribidi Version: 0.10.7 -Release: 2 +Release: 3 URL: http://fribidi.org Source0: %{name}-%{version}.tar.gz Patch0: fribidi-0.10.7-multiarchdevel.patch @@ -62,6 +62,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Tue May 23 2006 Caolan McNamara 0.10.7-3 +- rh#192669# clearly I didn't actually get around to basing fribidi-config + of pkg-config output + * Tue May 02 2006 Caolan McNamara 0.10.7-2 - base fribidi-config on pkg-config output - allow fribidi_config.h to be the same on 32 and 64 bit