rpms/libbonobo/devel libbonobo-2.13.1-multishlib.patch, NONE, 1.1 libbonobo.spec, 1.23, 1.24

[fedora-cvs-commits at redhat.com]

Author: rstrode

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

Modified Files:
	libbonobo.spec 
Added Files:
	libbonobo-2.13.1-multishlib.patch 
Log Message:
- Step one of the multi-bonoboshlib process
  (bug 156982)


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

--- NEW FILE libbonobo-2.13.1-multishlib.patch ---
--- libbonobo-2.13.1/activation-server/Makefile.am.multishlib	2006-01-18 18:42:26.000000000 -0500
+++ libbonobo-2.13.1/activation-server/Makefile.am	2006-01-18 18:43:24.000000000 -0500
@@ -6,13 +6,19 @@
 libexec_PROGRAMS=bonobo-activation-server
 noinst_PROGRAMS=test-performance
 
+serverinfolibdir = $(libdir)/bonobo/servers
+
+ifneq ($(libdir), $(exec_prefix)/lib)
+serverinfolibdir := $(serverinfolibdir):$(exec_prefix)/lib/bonobo/servers
+endif
+
 INCLUDES=					\
 	-I$(top_srcdir) 			\
 	-I$(top_builddir) 			\
 	-I$(top_builddir)/bonobo-activation	\
 	-I$(top_srcdir)/bonobo-activation	\
 	-DPREFIX=\""$(prefix)"\"		\
-	-DSERVERINFODIR=\"$(libdir)/bonobo/servers\" \
+	-DSERVERINFODIR=\"$(serverinfolibdir)\" \
         -DSERVER_LOCALEDIR=\""${prefix}/${DATADIRNAME}/locale"\" \
 	$(SERVER_CFLAGS)			\
 	-DSERVER_CONFDIR=\"$(sysconfdir)\"	\


Index: libbonobo.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libbonobo.spec	17 Jan 2006 02:52:56 -0000	1.23
+++ libbonobo.spec	19 Jan 2006 00:37:40 -0000	1.24
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.13.1
-Release: 1
+Release: 2
 URL: http://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -21,6 +21,8 @@
 Obsoletes: bonobo-activation
 Provides: bonobo-activation = %{version}-%{release}
 
+Patch0: libbonobo-2.13.1-multishlib.patch
+
 %description
 Bonobo is a component system based on CORBA, used by the GNOME desktop.
 
@@ -44,6 +46,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .multishlib
 
 %build
 %configure --disable-gtk-doc
@@ -100,6 +103,10 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Wed Jan 18 2006 Ray Strode <rstrode at redhat.com> 2.13.1-2
+- Step one of the multi-bonoboshlib process
+  (bug 156982)
+
 * Mon Jan 16 2006 Matthias Clasen <mclasen at redhat.com>
 - Update to 2.13.1