rpm patches for oaf-0.3.0 and bonobo-0.13

["Andrew S. Howell" <andy tibcofinance com>]

Hello,

	I made a RPM spec file oaf-0.3.0, and fixed some problems with
	missing files in bonobo-0.13.

	A word of warning. I am rather new to the world of automake
	and RPM etc. I don't think I botched it, but you never know :)

	One change that I am worried about is Makefile.in for
	oaf. There were a few changes that I didn't understand why
	they were made. I assume this was due just to automake's
	magic.

	With bonobo, some files are no longer installed:

	%{prefix}/bin/bonobo-image-x-png
	%{prefix}/share/gnome/bonobo/docs/*

	I add 'docs' to the bonobo-devel

	Hope this helps....

Regrards,

	Andy

diff -uN oaf-0.3.0/Makefile.am oaf-0.3.0-rpm/Makefile.am
--- oaf-0.3.0/Makefile.am	Fri Apr 28 13:32:55 2000
+++ oaf-0.3.0-rpm/Makefile.am	Sat May 13 21:52:08 2000
@@ -2,10 +2,14 @@
 
 bin_SCRIPTS=oaf-config
 
-EXTRA_DIST=oaf-config.in oaf.m4 oafConf.sh.in oafConf.sh
+EXTRA_DIST=oaf-config.in oaf.m4 oafConf.sh.in oafConf.sh oaf.spec.in
 
 confexecdir = $(libdir)
 confexec_DATA = oafConf.sh
 
 m4datadir=$(datadir)/aclocal
 m4data_DATA=oaf.m4
+
+dist-hook: oaf.spec
+	cp oaf.spec $(distdir)
+
diff -uN oaf-0.3.0/Makefile.in oaf-0.3.0-rpm/Makefile.in
--- oaf-0.3.0/Makefile.in	Wed May 10 16:42:25 2000
+++ oaf-0.3.0-rpm/Makefile.in	Sat May 13 22:12:19 2000
@@ -93,7 +93,7 @@
 
 bin_SCRIPTS = oaf-config
 
-EXTRA_DIST = oaf-config.in oaf.m4 oafConf.sh.in oafConf.sh
+EXTRA_DIST = oaf-config.in oaf.m4 oafConf.sh.in oafConf.sh oaf.spec.in
 
 confexecdir = $(libdir)
 confexec_DATA = oafConf.sh
@@ -103,7 +103,7 @@
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =  oaf-config oafConf.sh
+CONFIG_CLEAN_FILES =  oaf.spec oaf-config oafConf.sh
 SCRIPTS =  $(bin_SCRIPTS)
 
 DATA =  $(confexec_DATA) $(m4data_DATA)
@@ -111,7 +111,8 @@
 DIST_COMMON =  README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \
 INSTALL Makefile.am Makefile.in NEWS TODO acconfig.h aclocal.m4 \
 config.guess config.h.in config.sub configure configure.in install-sh \
-ltconfig ltmain.sh missing mkinstalldirs oaf-config.in oafConf.sh.in
+ltconfig ltmain.sh missing mkinstalldirs oaf-config.in oaf.spec.in \
+oafConf.sh.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -121,9 +122,9 @@
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -162,6 +163,8 @@
 	-rm -f config.h
 
 maintainer-clean-hdr:
+oaf.spec: $(top_builddir)/config.status oaf.spec.in
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 oaf-config: $(top_builddir)/config.status oaf-config.in
 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 oafConf.sh: $(top_builddir)/config.status oafConf.sh.in
@@ -351,10 +354,15 @@
 	-rm -rf $(distdir)
 	mkdir $(distdir)
 	-chmod 777 $(distdir)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -371,6 +379,7 @@
 	      || exit 1; \
 	  fi; \
 	done
+	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
 info-am:
 info: info-recursive
 dvi-am:
@@ -450,6 +459,9 @@
 installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
+
+dist-hook: oaf.spec
+	cp oaf.spec $(distdir)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -uN oaf-0.3.0/configure oaf-0.3.0-rpm/configure
--- oaf-0.3.0/configure	Wed May 10 13:29:01 2000
+++ oaf-0.3.0-rpm/configure	Sat May 13 22:12:27 2000
@@ -3403,6 +3403,7 @@
 ac_given_INSTALL="$INSTALL"
 
 trap 'rm -fr `echo "
+oaf.spec
 Makefile
 idl/Makefile
 docs/Makefile
@@ -3534,7 +3535,8 @@
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile
+CONFIG_FILES=\${CONFIG_FILES-"oaf.spec
+Makefile
 idl/Makefile
 docs/Makefile
 liboaf/Makefile
diff -uN oaf-0.3.0/configure.in oaf-0.3.0-rpm/configure.in
--- oaf-0.3.0/configure.in	Wed May 10 13:27:17 2000
+++ oaf-0.3.0-rpm/configure.in	Sat May 13 22:12:14 2000
@@ -81,6 +81,7 @@
 fi
 
 AC_OUTPUT([
+oaf.spec
 Makefile
 idl/Makefile
 docs/Makefile
diff -uN oaf-0.3.0/oaf.spec.in oaf-0.3.0-rpm/oaf.spec.in
--- oaf-0.3.0/oaf.spec.in	Thu Jan  1 09:00:00 1970
+++ oaf-0.3.0-rpm/oaf.spec.in	Sun May 14 01:14:38 2000
@@ -0,0 +1,105 @@
+# Note this is NOT a relocatable thing :)
+%define name		oaf
+%define ver		@VERSION@
+%define RELEASE		1
+%define rel		%{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
+%define prefix		/usr
+%define sysconfdir	/etc
+
+Name:		%name
+Summary:	Library for CORBA CosNaming Service in GNOME
+Version: 	%ver
+Release: 	%rel
+Copyright: 	GPL
+Group:		System Environment/Libraries
+Source: 	%{name}-%{ver}.tar.gz
+URL: 		http://www.gnome.org/
+BuildRoot:	/var/tmp/%{name}-%{ver}-root
+Docdir: 	%{prefix}/doc
+
+%description
+OAF is a library and daemon that provides the CORBA CosNaming service.
+
+%package devel
+Summary:	Libraries and include files for the Bonobo document model
+Group:		Development/Libraries
+Requires:	%name = %{PACKAGE_VERSION}
+Obsoletes:	%{name}-devel
+
+%description devel
+This package provides the necessary development libraries for the OAF
+CORBA CosNaming service
+
+%changelog
+* Sun May 14 2000 Andy Howell <andy@tibcofinance.com>
+- Created spec file from bonobo.spec.in
+
+%prep
+%setup
+
+%build
+%ifarch alpha
+  MYARCH_FLAGS="--host=alpha-redhat-linux"
+%endif
+
+LC_ALL=""
+LINGUAS=""
+LANG=""
+export LC_ALL LINGUAS LANG
+
+CFLAGS="$RPM_OPT_FLAGS" ./configure $MYARCH_FLAGS --prefix=%{prefix} \
+	--sysconfdir=%{sysconfdir}
+
+if [ "$SMP" != "" ]; then
+  (make "MAKE=make -k -j $SMP"; exit 0)
+  make
+else
+  make
+fi
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+make prefix=$RPM_BUILD_ROOT%{prefix} sysconfdir=$RPM_BUILD_ROOT%{sysconfdir} install
+
+for FILE in "$RPM_BUILD_ROOT/bin/*"; do
+	file "$FILE" | grep -q not\ stripped && strip $FILE
+done
+
+%clean
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%post
+if ! grep %{prefix}/lib /etc/ld.so.conf > /dev/null ; then
+  echo "%{prefix}/lib" >> /etc/ld.so.conf
+fi
+  
+/sbin/ldconfig
+  
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(0555, bin, bin)
+
+%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%{prefix}/bin/oaf-client
+%{prefix}/bin/oaf-config
+%{prefix}/bin/oaf-run-query
+%{prefix}/bin/oafd
+%{prefix}/lib/lib*.so.*
+
+%files devel
+%defattr(0555, bin, bin)
+
+%doc docs
+%dir %{prefix}/include/liboaf
+%{prefix}/lib/*.so*
+%{prefix}/lib/*.la
+
+%defattr(0444, bin, bin)
+%{prefix}/lib/*Conf.sh
+%{prefix}/include/liboaf/*
+%{prefix}/share/idl/*.idl
+%{prefix}/share/oaf/*.oafinfo
+%{prefix}/share/aclocal/*
+
diff -uN bonobo-0.13/bonobo.spec.in bonobo-0.13-rpm/bonobo.spec.in
--- bonobo-0.13/bonobo.spec.in	Fri Mar 31 02:51:14 2000
+++ bonobo-0.13-rpm/bonobo.spec.in	Sat May 13 23:58:43 2000
@@ -99,22 +99,16 @@
 
 %files
 %defattr(0555, bin, bin)
-%dir %{prefix}/share/gnome/bonobo
 
 %doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README
 %{prefix}/bin/bonobo-application-x-mines
 %{prefix}/bin/bonobo-audio-ulaw
-%{prefix}/bin/bonobo-image-x-png
 %{prefix}/bin/bonobo-text-plain
 %{prefix}/bin/efstool
 %{prefix}/bin/paint-component-simple
 %{prefix}/bin/sample-container
 %{prefix}/lib/lib*.so.*
 
-%defattr(0644, bin, bin)
-#%{prefix}/share/gnome/apps/Games/*
-%{prefix}/share/gnome/bonobo/docs/*
-
 %defattr (0444, bin, bin)
 %{prefix}/share/locale/*/LC_MESSAGES/*
 %{prefix}/share/mime-info/bonobo.keys
@@ -123,6 +117,7 @@
 %files devel
 
 %defattr(0555, bin, bin)
+%doc docs 
 %dir %{prefix}/include/bonobo
 %{prefix}/lib/*.a
 %{prefix}/lib/*.so