From 7a22fd98998881ff9c68a5b3ecea390ae7bf21eb Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@fedoraproject.org>
Date: Tue, 15 Jun 2010 10:50:20 +0000
Subject: [PATCH] Update to 1.7.3 and fix #602880

---
 c-ares-multilib.patch | 41 +++++++++++++++++++++++++++++++++++++++++
 c-ares.spec           | 12 ++++++++----
 2 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 c-ares-multilib.patch

diff --git a/c-ares-multilib.patch b/c-ares-multilib.patch
new file mode 100644
index 0000000..3f85836
--- /dev/null
+++ b/c-ares-multilib.patch
@@ -0,0 +1,41 @@
+diff -up ./ares_build.h.in.multilib ./ares_build.h.in
+--- ./ares_build.h.in.multilib	2010-03-23 13:41:44.000000000 +0100
++++ ./ares_build.h.in	2010-06-15 10:38:15.804618311 +0200
+@@ -96,9 +96,6 @@
+ #  include <sys/socket.h>
+ #endif
+ 
+-/* The size of `long', as computed by sizeof. */
+-#undef CARES_SIZEOF_LONG
+-
+ /* Integral data type used for ares_socklen_t. */
+ #undef CARES_TYPEOF_ARES_SOCKLEN_T
+ 
+diff -up ./ares_rules.h.multilib ./ares_rules.h
+--- ./ares_rules.h.multilib	2010-06-15 10:39:22.895368907 +0200
++++ ./ares_rules.h	2010-06-15 10:40:19.271619152 +0200
+@@ -69,10 +69,12 @@
+  * Verify that some macros are actually defined.
+  */
+ 
++#if 0
+ #ifndef CARES_SIZEOF_LONG
+ #  error "CARES_SIZEOF_LONG definition is missing!"
+    Error Compilation_aborted_CARES_SIZEOF_LONG_is_missing
+ #endif
++#endif
+ 
+ #ifndef CARES_TYPEOF_ARES_SOCKLEN_T
+ #  error "CARES_TYPEOF_ARES_SOCKLEN_T definition is missing!"
+@@ -97,9 +99,11 @@
+  * is the same as the one reported by sizeof() at compile time.
+  */
+ 
++#if 0
+ typedef char
+   __cares_rule_01__
+     [CareschkszEQ(long, CARES_SIZEOF_LONG)];
++#endif
+ 
+ /*
+  * Verify that the size previously defined and expected for
diff --git a/c-ares.spec b/c-ares.spec
index 590dd3e..76a06ec 100644
--- a/c-ares.spec
+++ b/c-ares.spec
@@ -1,14 +1,14 @@
 Summary: A library that performs asynchronous DNS operations
 Name: c-ares
-Version: 1.7.1
-Release: 2%{?dist}
+Version: 1.7.3
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://c-ares.haxx.se/
 Source0: http://c-ares.haxx.se/c-ares-%{version}.tar.gz
 Source1: LICENSE
 Patch0: %{name}-1.7.0-optflags.patch
-Patch1: 0001-ares_init-Last-not-first-instance-of-domain-or-searc.patch
+Patch1: c-ares-multilib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -29,7 +29,7 @@ compile applications or shared objects that use c-ares.
 %prep
 %setup -q
 %patch0 -p1 -b .optflags
-%patch1 -p1 -b .search
+%patch1 -p1 -b .multilib
 cp %{SOURCE1} .
 f=CHANGES ; iconv -f iso-8859-1 -t utf-8 $f -o $f.utf8 ; mv $f.utf8 $f
 
@@ -66,6 +66,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/ares_*
 
 %changelog
+* Tue Jun 15 2010 Jakub Hrozek <jhrozek@redhat.com> - 1.7.3-1
+- Upgrade to new upstream release 1.7.3 (obsoletes search/domain patch)
+- Fix conflict of -devel packages on multilib architectures (#602880)
+
 * Thu Jun 3 2010 Jakub Hrozek <jhrozek@redhat.com> - 1.7.1-2
 - Use last instance of search/domain, not the first one (#597286)