rpms/libbonobo/devel libbonobo-2.13.1-multishlib.patch, 1.1, 1.2 libbonobo.spec, 1.29, 1.30

[fedora-cvs-commits at redhat.com]

Author: rstrode

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

Modified Files:
	libbonobo-2.13.1-multishlib.patch libbonobo.spec 
Log Message:
- run automake in %%build so that shlib patch gets
  built
- change libdir logic to happen at configure time because
  automake's conditional support isn't that sophisticated
- s/%%makeinstall/make install DESTDIR=$RPM_BUILD_ROOT/


libbonobo-2.13.1-multishlib.patch:
 activation-server/Makefile.am |    9 ++++++++-
 configure.in                  |    2 ++
 2 files changed, 10 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libbonobo-2.13.1-multishlib.patch	19 Jan 2006 00:37:39 -0000	1.1
+++ libbonobo-2.13.1-multishlib.patch	25 Jan 2006 21:49:23 -0000	1.2
@@ -1,15 +1,27 @@
---- 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 @@
+--- 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 @@
+ AC_SUBST(IF_BSD_PS)
+ AC_SUBST(IF_POSIX_PS)
+ 
++AM_CONDITIONAL(MULTILIB_SERVER_FILES, test "$libdir" != "$exec_prefix/lib")
++
+ 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
+@@ -6,13 +6,20 @@
  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
++if MULTILIB_SERVER_FILES
++	serverinfolibdir := $(exec_prefix)/lib/bonobo/servers
 +endif
 +
++
  INCLUDES=					\
  	-I$(top_srcdir) 			\
  	-I$(top_builddir) 			\


Index: libbonobo.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- libbonobo.spec	25 Jan 2006 20:55:28 -0000	1.29
+++ libbonobo.spec	25 Jan 2006 21:49:23 -0000	1.30
@@ -49,7 +49,9 @@
 %patch0 -p1 -b .multishlib
 
 %build
+aclocal
 automake
+autoconf
 %configure --disable-gtk-doc
 
 make
@@ -112,6 +114,8 @@
 * Wed Jan 25 2006 Ray Strode <rstrode at redhat.com> 2.13.1-7
 - run automake in %%build so that shlib patch gets
   built
+- change libdir logic to happen at configure time because
+  automake's conditional support isn't that sophisticated
 - s/%%makeinstall/make install DESTDIR=$RPM_BUILD_ROOT/
 
 * Thu Jan 19 2006 Ray Strode <rstrode at redhat.com> 2.13.1-6