rpms/libbonobo/devel libbonobo-2.13.1-multishlib.patch, 1.2, 1.3 libbonobo.spec, 1.31, 1.32

[fedora-cvs-commits at redhat.com]

Author: rstrode

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

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


libbonobo-2.13.1-multishlib.patch:
 activation-server/Makefile.am |    9 ++++++++-
 configure.in                  |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 42 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libbonobo-2.13.1-multishlib.patch	25 Jan 2006 21:49:23 -0000	1.2
+++ libbonobo-2.13.1-multishlib.patch	26 Jan 2006 20:37:20 -0000	1.3
@@ -1,16 +1,48 @@
---- libbonobo-2.13.1/configure.in.multishlib	2006-01-25 16:38:53.000000000 -0500
-+++ libbonobo-2.13.1/configure.in	2006-01-25 16:46:03.000000000 -0500
-@@ -233,6 +233,8 @@
+--- 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)
  
-+AM_CONDITIONAL(MULTILIB_SERVER_FILES, test "$libdir" != "$exec_prefix/lib")
++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-25 16:44:26.000000000 -0500
++++ 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


Index: libbonobo.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- libbonobo.spec	25 Jan 2006 21:55:23 -0000	1.31
+++ libbonobo.spec	26 Jan 2006 20:37:20 -0000	1.32
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.13.1
-Release: 7
+Release: 8
 URL: http://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -17,6 +17,7 @@
 BuildPreReq: intltool >= 0.14-1
 BuildPreReq: automake16 autoconf libtool
 BuildPreReq: gtk-doc
+BuildPreReq: flex, bison, zlib-devel
 # From 2.3, libbonobo swallowed bonobo-activation
 Obsoletes: bonobo-activation
 Provides: bonobo-activation = %{version}-%{release}
@@ -112,6 +113,9 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Wed Jan 25 2006 Ray Strode <rstrode at redhat.com> 2.13.1-8
+- one more iteration of the shlib patch
+
 * Wed Jan 25 2006 Ray Strode <rstrode at redhat.com> 2.13.1-7
 - run automake in %%build so that shlib patch gets
   built