bonobo 0.18 rpm building (to be original :P)

[Chipzz <chipzz ULYSSIS Org>]

Once again, a problem with building the bonobo rpm.
I have attached a diff that should solve the problem (I don't know if
bonobrowser actually _WORKS_, I've just made a diff to make the rpm build.
It may have to be the other way around, that you have to comment the line
containing bonobrowser in the spec out).
The diff is attached.

Greetings,

Chipzz AKA
Jan Van Buggenhout
-- 

--------------------------------------------------------------------------
                  UNIX isn't dead - It just smells funny
                            Chipzz ULYSSIS Org
--------------------------------------------------------------------------

diff -ur bonobo-0.18.orig/bonobo.spec bonobo-0.18/bonobo.spec
--- bonobo-0.18.orig/bonobo.spec	Thu Sep 14 13:44:35 2000
+++ bonobo-0.18/bonobo.spec	Thu Sep 14 13:50:49 2000
@@ -81,7 +81,7 @@
 
 make prefix=$RPM_BUILD_ROOT%{prefix} sysconfdir=$RPM_BUILD_ROOT%{sysconfdir} install
 
-for FILE in "$RPM_BUILD_ROOT/bin/*"; do
+for FILE in "$RPM_BUILD_ROOT/bin/*" "$RPM_BUILD_ROOT%{prefix}/bin/*"; do
 	file "$FILE" | grep -q not\ stripped && strip $FILE
 done
 
@@ -123,7 +123,7 @@
 %doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README
 
 %defattr (0444, bin, bin)
-%config %{sysconfdir}/CORBA/servers/*.gnorba
+#%config %{sysconfdir}/CORBA/servers/*.gnorba
 %{prefix}/share/bonobo/html/*.hierarchy
 %{prefix}/share/bonobo/html/*.sgml
 %{prefix}/share/bonobo/html/*.signals
diff -ur bonobo-0.18.orig/bonobo.spec.in bonobo-0.18/bonobo.spec.in
--- bonobo-0.18.orig/bonobo.spec.in	Thu Sep 14 13:41:33 2000
+++ bonobo-0.18/bonobo.spec.in	Thu Sep 14 13:52:17 2000
@@ -81,7 +81,7 @@
 
 make prefix=$RPM_BUILD_ROOT%{prefix} sysconfdir=$RPM_BUILD_ROOT%{sysconfdir} install
 
-for FILE in "$RPM_BUILD_ROOT/bin/*"; do
+for FILE in "$RPM_BUILD_ROOT/bin/*" "$RPM_BUILD_ROOT%{prefix}/bin/*"; do
 	file "$FILE" | grep -q not\ stripped && strip $FILE
 done
 
@@ -123,7 +123,7 @@
 %doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README
 
 %defattr (0444, bin, bin)
-%config %{sysconfdir}/CORBA/servers/*.gnorba
+#%config %{sysconfdir}/CORBA/servers/*.gnorba
 %{prefix}/share/bonobo/html/*.hierarchy
 %{prefix}/share/bonobo/html/*.sgml
 %{prefix}/share/bonobo/html/*.signals
diff -ur bonobo-0.18.orig/tools/Makefile.in bonobo-0.18/tools/Makefile.in
--- bonobo-0.18.orig/tools/Makefile.in	Sun Aug 13 06:06:29 2000
+++ bonobo-0.18/tools/Makefile.in	Thu Sep 14 13:43:47 2000
@@ -143,7 +143,7 @@
 cxxflags_set = @cxxflags_set@
 l = @l@
 
- BUILD_BONOBROWSER_TRUE@SUBDIRS = bonobrowser
+SUBDIRS = bonobrowser
 DIST_SUBDIRS = bonobrowser
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
diff -ur bonobo-0.18.orig/tools/bonobrowser/Makefile.in bonobo-0.18/tools/bonobrowser/Makefile.in
--- bonobo-0.18.orig/tools/bonobrowser/Makefile.in	Sun Aug 13 06:06:31 2000
+++ bonobo-0.18/tools/bonobrowser/Makefile.in	Thu Sep 14 13:35:43 2000
@@ -67,7 +67,7 @@
 BONOBOX_LIBS = @BONOBOX_LIBS@
 BONOBOX_PRINT_LIBS = @BONOBOX_PRINT_LIBS@
 BONOBOX_TEST_CFLAGS = @BONOBOX_TEST_CFLAGS@
-BONOBOX_TEST_LIBS = @BONOBOX_TEST_LIBS@
+BONOBOX_TEST_LIBS = @BONOBOX_TEST_LIBS@ -lgnorba
 BONOBO_INCLUDEDIR = @BONOBO_INCLUDEDIR@
 BONOBO_LIBDIR = @BONOBO_LIBDIR@
 BONOBO_LIBS = @BONOBO_LIBS@