[libdb] fix multiarch conflict in libdb-devel, remove unneeded dos2unix BR

[Jindrich Novy]

commit edcd9c975a08efd930c9a5a34fd0880145145ebb
Author: Jindrich Novy <jnovy at redhat.com>
Date:   Sat Apr 21 09:25:27 2012 +0200

    fix multiarch conflict in libdb-devel, remove unneeded dos2unix BR

 libdb-multiarch.patch |   12 ++++++++++++
 libdb.spec            |    9 +++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/libdb-multiarch.patch b/libdb-multiarch.patch
new file mode 100644
index 0000000..f0e6ff6
--- /dev/null
+++ b/libdb-multiarch.patch
@@ -0,0 +1,12 @@
+diff -up db-5.3.15/dist/aclocal/sequence.m4.multiarch db-5.3.15/dist/aclocal/sequence.m4
+--- db-5.3.15/dist/aclocal/sequence.m4.multiarch	2010-06-25 17:50:36.000000000 +0200
++++ db-5.3.15/dist/aclocal/sequence.m4	2011-12-20 02:00:49.000000000 +0100
+@@ -78,7 +78,7 @@ AC_DEFUN(AM_SEQUENCE_CONFIGURE, [
+ 	fi
+ 	if test "$db_cv_build_sequence" = "yes"; then
+ 		AC_SUBST(db_seq_decl)
+-		db_seq_decl="typedef $db_cv_seq_type db_seq_t;";
++		db_seq_decl="typedef int64_t db_seq_t;";
+ 
+ 		AC_DEFINE(HAVE_64BIT_TYPES)
+ 		AH_TEMPLATE(HAVE_64BIT_TYPES,
diff --git a/libdb.spec b/libdb.spec
index 66f23da..ecd302b 100644
--- a/libdb.spec
+++ b/libdb.spec
@@ -4,9 +4,10 @@
 Summary: The Berkeley DB database library for C
 Name: libdb
 Version: 5.3.15
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
 Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz
+Patch0: libdb-multiarch.patch
 # db-1.85 upstream patches
 Patch10: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.1
 Patch11: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.2
@@ -24,7 +25,6 @@ BuildRequires: tcl-devel >= 8.5.2-3
 BuildRequires: gcc-java
 BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: chrpath
-BuildRequires: dos2unix
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Conflicts: filesystem < 3
 
@@ -144,6 +144,7 @@ for building programs which use the Berkeley DB in Java.
 %prep
 %setup -q -n db-%{version} -a 1
 
+%patch0 -p1 -b .multiarch
 pushd db.1.85/PORT/linux
 %patch10 -p0 -b .1.1
 popd
@@ -353,6 +354,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/java/*.jar
 
 %changelog
+* Sat Apr 21 2012 Jindrich Novy <jnovy at redhat.com> 5.3.15-2
+- fix multiarch conflict in libdb-devel (#812901)
+- remove unneeded dos2unix BR
+
 * Thu Mar 15 2012 Jindrich Novy <jnovy at redhat.com> 5.3.15-1
 - update to 5.3.15
   http://download.oracle.com/otndocs/products/berkeleydb/html/changelog_5_3.html