rpms/ORBit2/devel ORBit2-2.14.3-multilib.patch, NONE, 1.1 ORBit2.spec, 1.43, 1.44

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/ORBit2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17077

Modified Files:
	ORBit2.spec 
Added Files:
	ORBit2-2.14.3-multilib.patch 
Log Message:
Fix multilib issues


ORBit2-2.14.3-multilib.patch:
 orbit2-config.in |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE ORBit2-2.14.3-multilib.patch ---
--- 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()
 {


Index: ORBit2.spec
===================================================================
RCS file: /cvs/dist/rpms/ORBit2/devel/ORBit2.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ORBit2.spec	4 Sep 2006 23:45:20 -0000	1.43
+++ ORBit2.spec	5 Sep 2006 18:48:23 -0000	1.44
@@ -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: 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 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .multilib
  
 %build
 ## the shipped libtool is broken wrt. multilib
@@ -124,6 +127,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Tue Sep  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-2.fc6
+- Fix remaining multilib issues (#205228)
+
 * Mon Sep  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-1.fc6
 - Update to 2.14.3