From 5dc6d7cb62498bef75954e66617398baf970b0b5 Mon Sep 17 00:00:00 2001
From: Rene Rebe <rene.rebe@gmx.net>
Date: Thu, 24 Jun 2004 22:33:21 +0000
Subject: [PATCH] Rene Rebe: 	* fixed bdb42 .a file to contain the .o files
 rather than the .la files 	  (of course flist tripple checked before the
 commit ...)

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3385 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/base/bdb42/noinst-major.patch | 67 +++++----------------------
 1 file changed, 12 insertions(+), 55 deletions(-)

diff --git a/package/base/bdb42/noinst-major.patch b/package/base/bdb42/noinst-major.patch
index e005e8974..c724fbe20 100644
--- a/package/base/bdb42/noinst-major.patch
+++ b/package/base/bdb42/noinst-major.patch
@@ -1,78 +1,35 @@
---- ./dist/Makefile.in.orig	2003-12-16 19:42:57.000000000 -0300
-+++ ./dist/Makefile.in	2003-12-16 19:52:04.000000000 -0300
-@@ -61,12 +61,10 @@
- LIBSO_LIBS=	@LIBSO_LIBS@
- 
- libdb_base=	libdb
--libdb=		$(libdb_base).a
-+libdb=		$(libdb_base)-$(LIBVERSION).a
- libdb_version=	$(libdb_base)-$(LIBVERSION).a
- libso=		$(libdb_base)-$(LIBVERSION)@SOSUFFIX@
- libso_target=	$(libdb_base)-$(LIBVERSION).la
--libso_default=	$(libdb_base)@SOSUFFIX@
--libso_major=	$(libdb_base)-$(LIBMAJOR)@SOSUFFIX@
- 
+--- ./dist/Makefile.in.orig	2004-06-25 00:15:26.156739872 +0200
++++ ./dist/Makefile.in	2004-06-25 00:17:37.499772696 +0200
+@@ -590,27 +590,14 @@
+ # List of files installed into the library directory.
  ##################################################
- # C++ API.
-@@ -80,12 +78,10 @@
- LIBXSO_LIBS=	@LIBXSO_LIBS@
- 
- libcxx_base=	libdb_cxx
--libcxx=		$(libcxx_base).a
-+libcxx=		$(libcxx_base)-$(LIBVERSION).a
- libcxx_version=	$(libcxx_base)-$(LIBVERSION).a
- libxso=		$(libcxx_base)-$(LIBVERSION)@SOSUFFIX@
- libxso_target=	$(libcxx_base)-$(LIBVERSION).la
--libxso_default=	$(libcxx_base)@SOSUFFIX@
--libxso_major=	$(libcxx_base)-$(LIBMAJOR)@SOSUFFIX@
- 
- ##################################################
- # Java API.
-@@ -115,8 +111,6 @@
- libjso=		$(libjso_base)-$(LIBVERSION)@JMODSUFFIX@
- libjso_static=	$(libjso_base)-$(LIBVERSION).a
- libjso_target=	$(libjso_base)-$(LIBVERSION).la
--libjso_default=	$(libjso_base)@JMODSUFFIX@
--libjso_major=	$(libjso_base)-$(LIBMAJOR)@JMODSUFFIX@
- libjso_g=	$(libjso_base)-$(LIBVERSION)_g@JMODSUFFIX@
- 
- ##################################################
-@@ -130,8 +124,6 @@
- libtso=		$(libtso_base)-$(LIBVERSION)@MODSUFFIX@
- libtso_static=	$(libtso_base)-$(LIBVERSION).a
- libtso_target=	$(libtso_base)-$(LIBVERSION).la
--libtso_default=	$(libtso_base)@MODSUFFIX@
--libtso_major=	$(libtso_base)-$(LIBMAJOR)@MODSUFFIX@
- 
- ##################################################
- # db_dump185 UTILITY
-@@ -592,25 +584,17 @@
  LIB_INSTALL_FILE_LIST=\
- 	$(libdb) \
- 	$(libso) \
+-	$(libdb) \
+-	$(libso) \
 -	$(libso_default) \
 -	$(libso_major) \
  	$(libdb_version) \
  	$(libso_target) \
- 	$(libcxx) \
- 	$(libxso) \
+-	$(libcxx) \
+-	$(libxso) \
 -	$(libxso_default) \
 -	$(libxso_major) \
  	$(libcxx_version) \
  	$(libxso_target) \
- 	$(libtso) \
+-	$(libtso) \
 -	$(libtso_default) \
 -	$(libtso_major) \
  	$(libtso_static) \
  	$(libtso_target) \
- 	$(libjso) \
+-	$(libjso) \
 -	$(libjso_default) \
  	$(libjso_g) \
 -	$(libjso_major) \
++	$(libjso_default) \
  	$(libjso_static) \
  	$(libjso_target) \
  	$(libj_exjarfile) \
-@@ -811,14 +795,6 @@
+@@ -811,14 +798,6 @@
  	@cd $(DESTDIR)$(libdir) && $(rm) -f $(LIB_INSTALL_FILE_LIST)
  	@$(INSTALLER) @INSTALL_LIBS@ $(DESTDIR)$(libdir)
  	@(cd $(DESTDIR)$(libdir) && \