From 8889a4375a1ccbe9d49d5caf511ddcfdf25a034d Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@geeks.cl>
Date: Fri, 19 Dec 2003 15:52:22 +0000
Subject: [PATCH] Alejandro Mery <amery@geeks.cl>: patch bdb42 to not install
 links for mayor (4) and default db, fixing shares with bdb41 (current
 default)

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2019 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 Documentation/Developers/CHANGELOG-RENE |  1 +
 package/base/bdb42/noinst-mayor.patch   | 89 +++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 package/base/bdb42/noinst-mayor.patch

diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE
index 699d4baa9..93172204b 100644
--- a/Documentation/Developers/CHANGELOG-RENE
+++ b/Documentation/Developers/CHANGELOG-RENE
@@ -10,6 +10,7 @@
  - cleanup of tcp_wrappers.conf
  - Alejandro Mery: updated lvs->ipvsadm, keepalived
                    updated smartmontoolsa, openvpn and rsbac
+                   fixed shared files of bdb41 vs. bdb42
  - Miguel Bolanos: substituted "Ultra SPARC" with "UltraSPARC"
                    Alpha optimisations selection
                    Documentation/ updates
diff --git a/package/base/bdb42/noinst-mayor.patch b/package/base/bdb42/noinst-mayor.patch
new file mode 100644
index 000000000..e005e8974
--- /dev/null
+++ b/package/base/bdb42/noinst-mayor.patch
@@ -0,0 +1,89 @@
+--- ./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@
+ 
+ ##################################################
+ # 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) \
+-	$(libso_default) \
+-	$(libso_major) \
+ 	$(libdb_version) \
+ 	$(libso_target) \
+ 	$(libcxx) \
+ 	$(libxso) \
+-	$(libxso_default) \
+-	$(libxso_major) \
+ 	$(libcxx_version) \
+ 	$(libxso_target) \
+ 	$(libtso) \
+-	$(libtso_default) \
+-	$(libtso_major) \
+ 	$(libtso_static) \
+ 	$(libtso_target) \
+ 	$(libjso) \
+-	$(libjso_default) \
+ 	$(libjso_g) \
+-	$(libjso_major) \
+ 	$(libjso_static) \
+ 	$(libjso_target) \
+ 	$(libj_exjarfile) \
+@@ -811,14 +795,6 @@
+ 	@cd $(DESTDIR)$(libdir) && $(rm) -f $(LIB_INSTALL_FILE_LIST)
+ 	@$(INSTALLER) @INSTALL_LIBS@ $(DESTDIR)$(libdir)
+ 	@(cd $(DESTDIR)$(libdir) && \
+-	    test -f $(libso) && $(ln) -s $(libso) $(libso_default); \
+-	    test -f $(libso) && $(ln) -s $(libso) $(libso_major); \
+-	    test -f $(libxso) && $(ln) -s $(libxso) $(libxso_default); \
+-	    test -f $(libxso) && $(ln) -s $(libxso) $(libxso_major); \
+-	    test -f $(libtso) && $(ln) -s $(libtso) $(libtso_default); \
+-	    test -f $(libtso) && $(ln) -s $(libtso) $(libtso_major); \
+-	    test -f $(libjso) && $(ln) -s $(libjso) $(libjso_default); \
+-	    test -f $(libjso) && $(ln) -s $(libjso) $(libjso_major); \
+ 	    test -f $(libjso) && $(ln) -s $(libjso) $(libjso_g)) || true
+ 	@(test -f $(libj_jarfile) && \
+ 	    $(cp) $(libj_jarfile) $(DESTDIR)$(libdir) && \