rpms/libbonobo/devel libbonobo-2.13.1-multishlib.patch, 1.3, 1.4 libbonobo.spec, 1.34, 1.35

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/libbonobo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14940

Modified Files:
	libbonobo-2.13.1-multishlib.patch libbonobo.spec 
Log Message:
- yet another iteration of the shlib patch


libbonobo-2.13.1-multishlib.patch:
 Makefile.am |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletion(-)

Index: libbonobo-2.13.1-multishlib.patch
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo-2.13.1-multishlib.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libbonobo-2.13.1-multishlib.patch	26 Jan 2006 20:37:20 -0000	1.3
+++ libbonobo-2.13.1-multishlib.patch	15 Feb 2006 22:15:25 -0000	1.4
@@ -1,57 +1,14 @@
---- libbonobo-2.13.1/configure.in.multishlib	2006-01-16 13:58:48.000000000 -0500
-+++ libbonobo-2.13.1/configure.in	2006-01-26 14:40:41.000000000 -0500
-@@ -233,6 +233,40 @@
- AC_SUBST(IF_BSD_PS)
- AC_SUBST(IF_POSIX_PS)
- 
-+multilib_server_files="no"
-+AC_MSG_CHECKING(for multi-arch bonobo server paths)
-+
-+# hack stolen from dbus to expand libdir out
-+if test "x$prefix" = "xNONE"; then
-+  deduced_prefix=$ac_default_prefix
-+else
-+  deduced_prefix=$prefix
-+fi
-+
-+old_prefix=$prefix
-+prefix=$deduced_prefix
-+
-+if test "x$exec_prefix" = xNONE ; then
-+   deduced_exec_prefix=$deduced_prefix
-+else
-+   deduced_exec_prefix=$exec_prefix
-+fi
-+old_exec_prefix=$exec_prefix
-+exec_prefix=$deduced_exec_prefix
-+expanded_libdir=`eval echo $libdir`
-+prefix=$old_prefix
-+
-+if test "${exec_prefix}/lib" != "${expanded_libdir}"; then
-+    multilib_server_files="yes"
-+    AC_MSG_RESULT(yes)
-+else
-+    multilib_server_files="no"
-+    AC_MSG_RESULT(no)
-+fi
-+exec_prefix=$old_exec_prefix
-+
-+AM_CONDITIONAL(MULTILIB_SERVER_FILES, test "${multilib_server_files}" = "yes")
-+
- AC_OUTPUT([
- Makefile
- libbonobo-zip
 --- libbonobo-2.13.1/activation-server/Makefile.am.multishlib	2005-07-04 18:05:49.000000000 -0400
 +++ libbonobo-2.13.1/activation-server/Makefile.am	2006-01-26 14:39:22.000000000 -0500
 @@ -6,13 +6,20 @@
  libexec_PROGRAMS=bonobo-activation-server
  noinst_PROGRAMS=test-performance
  
-+serverinfolibdir = $(libdir)/bonobo/servers
++serverinfolibdir = $(libdir)/bonobo/servers:$(exec_prefix)/lib/bonobo/servers
++
++
++
 +
-+if MULTILIB_SERVER_FILES
-+	serverinfolibdir := $(exec_prefix)/lib/bonobo/servers
-+endif
 +
 +
  INCLUDES=					\


Index: libbonobo.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libbonobo.spec	11 Feb 2006 03:52:45 -0000	1.34
+++ libbonobo.spec	15 Feb 2006 22:15:25 -0000	1.35
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.13.1
-Release: 8.2
+Release: 9
 URL: http://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -47,7 +47,10 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+
+%ifarch ppc64 s390x x86_64
 %patch0 -p1 -b .multishlib
+%endif
 
 %build
 intltoolize -f
@@ -113,6 +116,9 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Wed Feb 15 2006 Ray Strode <rstrode at redhat.com> 2.13.1-9
+- yet another iteration of the shlib patch
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.1-8.2
 - bump again for double-long bug on ppc(64)