[gnome-db] libgnomedb and mergeant spec.in patches

[Yanko Kaneti <yaneti declera com>]

Hi again

Here are two more spec.in patches. 
The one for libgnomedb adds the scrollkeeper bits and --disable-gtk-doc

The one for mergeant rewrites the spec file and also updates the doc
build system to make it respect DESTDIR and be a bit more independant on
different db2html version output.


Cheers
Yanko


Index: libgnomedb.spec.in
===================================================================
RCS file: /cvs/gnome/libgnomedb/libgnomedb.spec.in,v
retrieving revision 1.3
diff -u -b -p -r1.3 libgnomedb.spec.in
--- libgnomedb.spec.in	20 Aug 2002 22:42:01 -0000	1.3
+++ libgnomedb.spec.in	28 Jan 2003 20:54:46 -0000
@@ -47,7 +47,7 @@ or compile programs that use libgda.
 %setup -q -n %{name}-%{version}
 
 %build
-%configure
+%configure --disable-gtk-doc
 make %{?_smp_mflags}
 
 %install
@@ -66,6 +66,12 @@ done
 
 %postun -p /sbin/ldconfig
 
+%post devel
+if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
+
+%postun devel
+if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
+
 %clean
 rm -rf %{buildroot}
 
@@ -88,6 +94,7 @@ rm -rf %{buildroot}
 %files devel
 %defattr(-,root,root)
 %doc %{_datadir}/gtk-doc/html/libgnomedb
+%{_datadir}/omf/*
 %{_includedir}/libgnomedb
 %{_libdir}/*.a
 %{_libdir}/*.la
@@ -96,6 +103,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jan 28 2003 Yanko Kaneti <yaneti delcera com>
+- Package and add the omf/scrollkeeper bits.
+- --disable-gtk-doc to configure because the generated docs are in the tarball
+
 * Mon Aug 19 2002 Ben Liblit <liblit acm org>
 - Fixed version number substitutions
 - Updated files list to match what "make install" actually installs

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/mergeant/ChangeLog,v
retrieving revision 1.115
diff -u -b -p -r1.115 ChangeLog
--- ChangeLog	28 Jan 2003 02:01:43 -0000	1.115
+++ ChangeLog	28 Jan 2003 22:01:53 -0000
@@ -1,3 +1,10 @@
+2003-01-28  Yanko Kaneti <yaneti declera com>
+
+	* mergeant.spec.in: Update/Rewrite
+	* doc/C/Makefile.am: Respect DESTDIR. Update the targets to make it 
+	work with different db2html versions. Install a index.html symlink 
+	if the file is not already present.
+
 2003-01-27  Rodrigo Moya <rodrigo gnome-db org>
 
 	Released 0.10.0
Index: mergeant.spec.in
===================================================================
RCS file: /cvs/gnome/mergeant/mergeant.spec.in,v
retrieving revision 1.3
diff -u -b -p -r1.3 mergeant.spec.in
--- mergeant.spec.in	24 Oct 2002 12:05:01 -0000	1.3
+++ mergeant.spec.in	28 Jan 2003 22:01:53 -0000
@@ -1,23 +1,12 @@
-# Note that this is NOT a relocatable package
-# defaults for redhat
-%define name	@PACKAGE@
-%define ver	@VERSION@
-%define prefix     /usr
-%define sysconfdir /etc
-
-%define  RELEASE 1
-%define  rel     %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
-
-Summary: Mergeant
-Name: 		%name
-Version:	%ver
-Release: 	%rel
+Summary: Mergeant database admin tool
+Name: 	mergeant
+Version:	@VERSION@
+Release: 0
 Copyright: 	GPL
 Group: 		X11/GNOME/Applications
-Source:		%{name}-%{ver}.tar.gz
-BuildRoot: 	/tmp/%{name}-%{ver}-root
+Source:		%{name}-%{version}.tar.gz
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
 URL: 		http://gasql.sourceforge.net/
-DocDir: 	%{prefix}/doc
 
 %description
 Mergeant is a database admin tool working with libgnomedb and libgda
@@ -26,47 +15,37 @@ Mergeant is a database admin tool workin
 %setup
 
 %build
-
-# libtool workaround for alphalinux
-%ifarch alpha
-  ARCH_FLAGS="--host=alpha-redhat-linux"
-%endif
-
-CFLAGS="$RPM_OPT_FLAGS" ./configure $ARCH_FLAGS --prefix=%{prefix} --sysconfdir=%{sysconfdir} 
-
-if [ "$SMP" != "" ]; then
-  (make "MAKE=make -k -j $SMP"; exit 0)
-  make
-else
-  make
-fi
+%configure
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-
-make prefix=$RPM_BUILD_ROOT%{prefix} sysconfdir=$RPM_BUILD_ROOT%{sysconfdir} \
-MERGEANT_Helpdir=$RPM_BUILD_ROOT%{prefix}/share/gnome/help/mergeant \
-Applicationsdir=$RPM_BUILD_ROOT%{prefix}/share/applications \
-Pixmapdir=$RPM_BUILD_ROOT%{prefix}/share/pixmaps \
-install
-
-strip $RPM_BUILD_ROOT%{prefix}/bin/* || :
+make DESTDIR=$RPM_BUILD_ROOT install
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
 							  
-%files
-%defattr(-, root, root)
-
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
-%doc examples/ 
-%{prefix}/bin/mergeant
-%{prefix}/share/pixmaps/*
-%{prefix}/share/locale/*
-%{prefix}/share/applications/mergeant.desktop
-%{prefix}/share/gnome/help/mergeant/C/*
-%{prefix}/share/mergeant/plugins/*
+%postun
+if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
 
+%files -f %{name}.lang
+%defattr(-, root, root)
+%doc AUTHORS examples COPYING ChangeLog NEWS README TODO
+%{_bindir}/*
+%{_datadir}/pixmaps/document-icons/*
+%{_datadir}/pixmaps/mergeant
+%{_datadir}/application-registry/*
+%{_datadir}/applications/*
+%{_datadir}/gnome/help/mergeant
+%{_datadir}/mergeant
+%{_datadir}/mime-info/*
+%{_datadir}/omf/*
+
+%changelog
+* Tue Jan 28 2003 Yanko Kaneti <yaneti declera com>
+- Update/Rewrite
 
Index: doc/C/Makefile.am
===================================================================
RCS file: /cvs/gnome/mergeant/doc/C/Makefile.am,v
retrieving revision 1.4
diff -u -b -p -r1.4 Makefile.am
--- doc/C/Makefile.am	15 Sep 2002 23:54:44 -0000	1.4
+++ doc/C/Makefile.am	28 Jan 2003 22:01:53 -0000
@@ -4,7 +4,7 @@ Mergeant_Lang_helpdir = $(MERGEANT_Helpd
 Mergeant_images = $(shell ls images/*.{eps,fig,jpg,gif})
 
 Mergeant_Lang_help_DATA = \
-	mergeant/mergeant.html \
+	mergeant \
 	topic.dat
 
 SGML_FILES = \
@@ -21,31 +21,36 @@ EXTRA_DIST = topic.dat $(SGML_FILES) $(M
 
 all:
 
-mergeant/mergeant.html: ${SGML_FILES}
+mergeant: ${SGML_FILES}
 	rm -rf mergeant
 	-db2html mergeant.sgml
 	-(cd mergeant; ln -s ../images images)
+	-(cd mergeant; \
+	  if test ! -f index.html ; then \
+	     if test -f mergeant.html ; then ln -s mergeant.html index.html ; elif \
+	        test -f book1.html ; then ln -s book1.html index.html ; fi ; \
+	  fi)
 
 # when we make 'dist', we include the generated HTML so people don't
 # have to have the docbook tools
-dist-hook:
+dist-hook: mergeant
 	-cp -R mergeant ${distdir}/mergeant
 
 
-install-data-local: mergeant/mergeant.html 
-	${mkinstalldirs} ${Mergeant_Lang_helpdir}/images
-	${mkinstalldirs} ${Mergeant_Lang_helpdir}/stylesheet-images
+install-data-local: mergeant 
+	${mkinstalldirs} $(DESTDIR)${Mergeant_Lang_helpdir}/images
+	${mkinstalldirs} $(DESTDIR)${Mergeant_Lang_helpdir}/stylesheet-images
 	-for file in ${srcdir}/mergeant/*.html ${srcdir}/mergeant/*.css; do \
 	basefile=`basename $$file`; \
-	${INSTALL_DATA} ${srcdir}/$$file ${Mergeant_Lang_helpdir}/$$basefile; \
+	${INSTALL_DATA} ${srcdir}/$$file $(DESTDIR)${Mergeant_Lang_helpdir}/$$basefile; \
 	done
 	-for file in ${srcdir}/mergeant/images/*; do \
 	basefile=`basename $$file`; \
-	${INSTALL_DATA} ${srcdir}/$$file ${Mergeant_Lang_helpdir}/images/$$basefile; \
+	${INSTALL_DATA} ${srcdir}/$$file $(DESTDIR)${Mergeant_Lang_helpdir}/images/$$basefile; \
 	done
 	-for file in ${srcdir}/mergeant/stylesheet-images/*; do \
 	basefile=`basename $$file`; \
-	${INSTALL_DATA} ${srcdir}/$$file ${Mergeant_Lang_helpdir}/stylesheet-images/$$basefile; \
+	${INSTALL_DATA} ${srcdir}/$$file $(DESTDIR)${Mergeant_Lang_helpdir}/stylesheet-images/$$basefile; \
 	done
 
 uninstall: