diff --git a/ORBit2-2.14.3-multilib.patch b/ORBit2-2.14.3-multilib.patch new file mode 100644 index 0000000..8895a4f --- /dev/null +++ b/ORBit2-2.14.3-multilib.patch @@ -0,0 +1,19 @@ +--- ORBit2-2.14.3/orbit2-config.in.multilib 2006-09-05 14:36:59.000000000 -0400 ++++ ORBit2-2.14.3/orbit2-config.in 2006-09-05 14:44:29.000000000 -0400 +@@ -1,11 +1,11 @@ + #! /bin/sh + +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-exec_prefix_set=no +-includedir=@includedir@ +-libdir=@libdir@ + [ -z "$PKG_CONFIG" ] && PKG_CONFIG="pkg-config" ++prefix=`${PKG_CONFIG} --variable prefix ORBit-2.0` ++exec_prefix=`${PKG_CONFIG} --variable exec_prefix ORBit-2.0` ++exec_prefix_set=no ++includedir=`${PKG_CONFIG} --variable includedir ORBit-2.0` ++libdir=`${PKG_CONFIG} --variable libdir ORBit-2.0` + + usage() + { diff --git a/ORBit2.spec b/ORBit2.spec index e92eab5..5c2a089 100644 --- a/ORBit2.spec +++ b/ORBit2.spec @@ -4,7 +4,7 @@ Summary: A high-performance CORBA Object Request Broker Name: ORBit2 Version: 2.14.3 -Release: 1%{?dist} +Release: 2%{?dist} Source: %{name}-%{version}.tar.bz2 Group: System Environment/Daemons License: LGPL/GPL @@ -18,6 +18,8 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: gtk-doc +Patch0: ORBit2-2.14.3-multilib.patch + %description ORBit is a high-performance CORBA (Common Object Request Broker Architecture) ORB (object request broker). It allows programs to @@ -52,6 +54,7 @@ write such programs, you'll also need to install the ORBIT package. %prep %setup -q +%patch0 -p1 -b .multilib %build ## the shipped libtool is broken wrt. multilib @@ -124,6 +127,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc %changelog +* Tue Sep 5 2006 Matthias Clasen - 2.14.3-2.fc6 +- Fix remaining multilib issues (#205228) + * Mon Sep 4 2006 Matthias Clasen - 2.14.3-1.fc6 - Update to 2.14.3