From 5e22ace44315750c2fce4cb039e9a3d928acb3b9 Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@fedoraproject.org>
Date: Mar 01 2010 14:12:40 +0000
Subject: - fix multilib issue (#478718) [jgorig]


---

diff --git a/bind.spec b/bind.spec
index fb743e5..8bb4075 100644
--- a/bind.spec
+++ b/bind.spec
@@ -21,7 +21,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  ISC
 Version:  9.7.0
-Release:  2%{?dist}
+Release:  3%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,6 +54,7 @@ Patch102:bind-95-rh452060.patch
 Patch106:bind93-rh490837.patch
 Patch107:bind97-dist-pkcs11.patch
 Patch108:bind97-managed-keyfile.patch
+Patch109:bind97-rh478718.patch
 
 # SDB patches
 Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -234,6 +235,7 @@ mkdir m4
 %patch102 -p1 -b .rh452060
 %patch106 -p0 -b .rh490837
 %patch107 -p1 -b .dist-pkcs11
+%patch109 -p1 -b .rh478718
 
 # Sparc and s390 arches need to use -fPIE
 %ifarch sparcv9 sparc64 s390 s390x
@@ -645,6 +647,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Mon Mar 01 2010 Adam Tkac <atkac redhat com> 32:9.7.0-3
+- fix multilib issue (#478718) [jgorig]
+
 * Mon Mar 01 2010 Adam Tkac <atkac redhat com> 32:9.7.0-2
 - improve automatic DNSSEC reconfiguration trigger
 - initscript now returns 2 in case that action doesn't exist (#523435)
diff --git a/bind97-rh478718.patch b/bind97-rh478718.patch
new file mode 100644
index 0000000..c6ea596
--- /dev/null
+++ b/bind97-rh478718.patch
@@ -0,0 +1,30 @@
+diff -up bind-9.7.0/configure.in.rh478718 bind-9.7.0/configure.in
+--- bind-9.7.0/configure.in.rh478718	2010-03-01 14:50:02.331207076 +0100
++++ bind-9.7.0/configure.in	2010-03-01 14:50:21.501207488 +0100
+@@ -2540,6 +2540,10 @@ main() {
+ 	AC_MSG_RESULT($arch)
+ fi
+ 
++if test ! "$arch" = "x86_64" -a "$have_xaddq" = "yes"; then
++	AC_MSG_ERROR([XADDQ present but disabled by Fedora patch!])
++fi
++
+ if test "$have_atomic" = "yes"; then
+ 	AC_MSG_CHECKING([compiler support for inline assembly code])
+ 
+diff -up bind-9.7.0/lib/isc/include/isc/platform.h.in.rh478718 bind-9.7.0/lib/isc/include/isc/platform.h.in
+--- bind-9.7.0/lib/isc/include/isc/platform.h.in.rh478718	2010-03-01 14:50:31.421207522 +0100
++++ bind-9.7.0/lib/isc/include/isc/platform.h.in	2010-03-01 14:50:40.313707286 +0100
+@@ -255,7 +255,11 @@
+  * If the "xaddq" operation (64bit xadd) is available on this architecture,
+  * ISC_PLATFORM_HAVEXADDQ will be defined.
+  */
+-@ISC_PLATFORM_HAVEXADDQ@
++#ifdef __x86_64__
++#define ISC_PLATFORM_HAVEXADDQ 1
++#else
++#undef ISC_PLATFORM_HAVEXADDQ
++#endif
+ 
+ /*
+  * If the "atomic swap" operation is available on this architecture,