db-4.6.21-1.85-compat.patch

Signed-off-by: Eduardo Lima (Etrunko) <eduardo.lima@intel.com>

diff --git a/dist/Makefile.in b/dist/Makefile.in
index 0d31970..4512c41 100644 (file)
--- a/dist/Makefile.in
+++ b/dist/Makefile.in
@@ -193,8 +193,8 @@ libtso_major=       $(libtcl_base)-$(LIBMAJOR)@LIBTSO_MODSUFFIX@
 # local libraries, for example.  Do that by adding -I options to the DB185INC
 # line, and -l options to the DB185LIB line.
 ##################################################
-DB185INC=      -c @CFLAGS@ -I$(topdir) @CPPFLAGS@
-DB185LIB=
+DB185INC=      -c @CFLAGS@ -I$(srcdir) -I$(srcdir)/db.1.85/PORT/linux/include @CPPFLAGS@
+DB185LIB=      ${srcdir}/db.1.85/PORT/linux/libdb.a
 
 ##################################################
 # Performance Event Monitoring definitions

diff --git a/packaging/db-4.6.21-1.85-compat.patch b/packaging/db-4.6.21-1.85-compat.patch
deleted file mode 100644 (file)
index 62ae950..0000000
--- a/packaging/db-4.6.21-1.85-compat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up db-5.1.19/dist/Makefile.in.185compat db-5.1.19/dist/Makefile.in
---- db-5.1.19/dist/Makefile.in.185compat       2010-08-27 17:08:03.000000000 +0200
-+++ db-5.1.19/dist/Makefile.in 2010-09-10 10:02:32.974640425 +0200
-@@ -193,8 +193,8 @@ libtso_major=      $(libtcl_base)-$(LIBMAJOR)
- # local libraries, for example.  Do that by adding -I options to the DB185INC
- # line, and -l options to the DB185LIB line.
- ##################################################
--DB185INC=     -c @CFLAGS@ -I$(topdir) @CPPFLAGS@
--DB185LIB=
-+DB185INC=     -c @CFLAGS@ -I$(srcdir) -I$(srcdir)/db.1.85/PORT/linux/include @CPPFLAGS@
-+DB185LIB=     ${srcdir}/db.1.85/PORT/linux/libdb.a
- 
- ##################################################
- # Performance Event Monitoring definitions

diff --git a/packaging/libdb.spec b/packaging/libdb.spec
index 04a262b..1283548 100644 (file)
--- a/packaging/libdb.spec
+++ b/packaging/libdb.spec
@@ -7,7 +7,6 @@ Version: 5.3.21
 Release: 11
 Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
 # other patches
-Patch22: db-4.6.21-1.85-compat.patch
 Patch24: db-4.5.20-jni-include-dir.patch
 # License clarification patch
 # http://devel.trisquel.info/gitweb/?p=package-helpers.git;a=blob;f=helpers/DATA/db4.8/007-mt19937db.c_license.patch;h=1036db4d337ce4c60984380b89afcaa63b2ef88f;hb=df48d40d3544088338759e8bea2e7f832a564d48
@@ -182,7 +181,6 @@ for building programs which use the Berkeley DB in Java.
 %prep
 %setup -q -n db-%{version}
 
-%patch22 -p1 -b .185compat
 %patch24 -p1 -b .4.5.20.jni
 %patch25 -p1 -b .licensefix