rpms/libbonobo/devel libbonobo-multishlib.patch, NONE, 1.1 libbonobo.spec, 1.79, 1.80 libbonobo-2.13.1-multishlib.patch, 1.4, NONE

[Matthias Clasen]

Author: mclasen

Update of /cvs/extras/rpms/libbonobo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23122

Modified Files:
	libbonobo.spec 
Added Files:
	libbonobo-multishlib.patch 
Removed Files:
	libbonobo-2.13.1-multishlib.patch 
Log Message:
fix patch


libbonobo-multishlib.patch:

--- NEW FILE libbonobo-multishlib.patch ---
diff -up libbonobo-2.23.1/activation-server/Makefile.am.multishlib libbonobo-2.23.1/activation-server/Makefile.am
--- libbonobo-2.23.1/activation-server/Makefile.am.multishlib	2007-01-01 18:46:55.000000000 -0500
+++ libbonobo-2.23.1/activation-server/Makefile.am	2008-08-22 20:23:53.000000000 -0400
@@ -6,13 +6,15 @@ bin_PROGRAMS=activation-client
 libexec_PROGRAMS=bonobo-activation-server
 noinst_PROGRAMS=test-performance
 
+serverinfolibdir = $(libdir)/bonobo/servers:$(exec_prefix)/lib/bonobo/servers
+
 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)			\
 	$(WARN_CFLAGS)				\


Index: libbonobo.spec
===================================================================
RCS file: /cvs/extras/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- libbonobo.spec	22 Aug 2008 23:54:35 -0000	1.79
+++ libbonobo.spec	23 Aug 2008 00:25:53 -0000	1.80
@@ -26,7 +26,7 @@
 Obsoletes: bonobo-activation
 Provides: bonobo-activation = %{version}-%{release}
 
-Patch0: libbonobo-2.13.1-multishlib.patch
+Patch0: libbonobo-multishlib.patch
 
 %description
 Bonobo is a component system based on CORBA, used by the GNOME desktop.
@@ -55,7 +55,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 
-%ifarch ppc64 s390x x86_64 
+%ifarch ppc64 s390x x86_64
 %patch0 -p1 -b .multishlib
 %endif
 


--- libbonobo-2.13.1-multishlib.patch DELETED ---