rpms/c-ares/F-13 c-ares-multilib.patch, NONE, 1.1 c-ares.spec, 1.20, 1.21

[Jakub Hrozek]

Author: jhrozek

Update of /cvs/pkgs/rpms/c-ares/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6094

Modified Files:
	c-ares.spec 
Added Files:
	c-ares-multilib.patch 
Log Message:
Fix #602880

c-ares-multilib.patch:
 ares_build.h.in |    3 ---
 ares_rules.h    |    4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE c-ares-multilib.patch ---
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


Index: c-ares.spec
===================================================================
RCS file: /cvs/pkgs/rpms/c-ares/F-13/c-ares.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- c-ares.spec	3 Jun 2010 11:42:58 -0000	1.20
+++ c-ares.spec	15 Jun 2010 11:00:58 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: A library that performs asynchronous DNS operations
 Name: c-ares
 Version: 1.7.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://c-ares.haxx.se/
@@ -10,6 +10,8 @@ Source1: LICENSE
 Patch0: %{name}-1.7.0-optflags.patch
 Patch1: 0001-Allow-the-use-of-IPv6-nameservers.patch
 Patch2: 0001-ares_init-Last-not-first-instance-of-domain-or-searc.patch
+# Fixes: #602880
+Patch3: %{name}-multilib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -32,6 +34,7 @@ compile applications or shared objects t
 %patch0 -p1 -b .optflags
 %patch1 -p1 -b .ipv6
 %patch2 -p1 -b .search
+%patch3 -p1 -b .multilib
 cp %{SOURCE1} .
 f=CHANGES ; iconv -f iso-8859-1 -t utf-8 $f -o $f.utf8 ; mv $f.utf8 $f
 
@@ -68,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/ares_*
 
 %changelog
+* Tue Jun 15 2010 Jakub Hrozek <jhrozek at redhat.com> - 1.7.0-5
+- Fix multilib -devel conflict (#602880)
+
 * Sun Mar  7 2010 Jakub Hrozek <jhrozek at redhat.com> - 1.7.0-4
 - Use last instance of search/domain, not the first one (#597286)