commit d32b811edd0f57254fa6886935625d2227f9bf77
Author: Jakub Hrozek <jhrozek at redhat.com>
Date: Mon May 13 11:49:34 2013 +0200
Update to c-ares-1.10.0
- Obsolete upstreamed patches
- Amend the multilib patch, there's no need to patch configure since we
are running autoreconf anyways
- https://raw.github.com/bagder/c-ares/cares-1_10_0/RELEASE-NOTES
...ide.m4-provide-AC_CONFIG_MACRO_DIR-defini.patch | 49 --------
...configure-fix-automake-1.13-compatibility.patch | 126 --------------------
c-ares-1.10.0-multilib.patch | 30 +++++
c-ares-1.8.0-multilib.patch | 48 --------
c-ares.spec | 19 ++--
5 files changed, 41 insertions(+), 231 deletions(-)
---
diff --git a/c-ares-1.10.0-multilib.patch b/c-ares-1.10.0-multilib.patch
new file mode 100644
index 0000000..4daa9d2
--- /dev/null
+++ b/c-ares-1.10.0-multilib.patch
@@ -0,0 +1,30 @@
+diff -up c-ares-1.10.0/ares_build.h.in.multilib c-ares-1.10.0/ares_build.h.in
+--- c-ares-1.10.0/ares_build.h.in.multilib 2013-05-13 11:40:22.697814087 +0200
++++ c-ares-1.10.0/ares_build.h.in 2013-05-13 11:40:26.236813966 +0200
+@@ -96,7 +96,14 @@
+ #endif
+
+ /* The size of `long', as computed by sizeof. */
+-#undef CARES_SIZEOF_LONG
++#include <bits/wordsize.h>
++#if __WORDSIZE == 32
++#define CARES_SIZEOF_LONG 4
++#elif __WORDSIZE == 64
++#define CARES_SIZEOF_LONG 8
++#else
++#error "Unknown word size"
++#endif
+
+ /* Integral data type used for ares_socklen_t. */
+ #undef CARES_TYPEOF_ARES_SOCKLEN_T
+diff -up c-ares-1.10.0/configure.ac.multilib c-ares-1.10.0/configure.ac
+--- c-ares-1.10.0/configure.ac.multilib 2013-05-13 11:41:00.480812797 +0200
++++ c-ares-1.10.0/configure.ac 2013-05-13 11:41:17.210812226 +0200
+@@ -457,7 +457,6 @@ AC_CHECK_SIZEOF(size_t)
+ AC_CHECK_SIZEOF(long)
+ AC_CHECK_SIZEOF(int)
+ AC_CHECK_SIZEOF(short)
+-CARES_CONFIGURE_LONG
+ AC_CHECK_SIZEOF(time_t)
+
+ AC_CHECK_TYPE(long long,
diff --git a/c-ares.spec b/c-ares.spec
index 2215752..cae7bfc 100644
--- a/c-ares.spec
+++ b/c-ares.spec
@@ -1,7 +1,7 @@
Summary: A library that performs asynchronous DNS operations
Name: c-ares
-Version: 1.9.1
-Release: 6%{?dist}
+Version: 1.10.0
+Release: 1%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://c-ares.haxx.se/
@@ -9,9 +9,7 @@ Source0: http://c-ares.haxx.se/download/%{name}-%{version}.tar.gz
# The license can be obtained at http://c-ares.haxx.se/license.html
Source1: LICENSE
Patch0: 0001-Use-RPM-compiler-options.patch
-Patch1: c-ares-1.8.0-multilib.patch
-Patch2: 0002-cares-override.m4-provide-AC_CONFIG_MACRO_DIR-defini.patch
-Patch3: 0003-configure-fix-automake-1.13-compatibility.patch
+Patch1: c-ares-1.10.0-multilib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,9 +35,7 @@ compile applications or shared objects that use c-ares.
%prep
%setup -q
%patch0 -p1 -b .optflags
-%patch1 -p0 -b .multilib
-%patch2 -p1 -b .override
-%patch3 -p1 -b .autoconf
+%patch1 -p1 -b .multilib
cp %{SOURCE1} .
f=CHANGES ; iconv -f iso-8859-1 -t utf-8 $f -o $f.utf8 ; mv $f.utf8 $f
@@ -78,6 +74,13 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/ares_*
%changelog
+* Mon May 13 2013 Jakub Hrozek <jhrozek at redhat.com> - 1.10.1-1
+- New upstream release 1.10
+- Obsolete upstreamed patches
+- Amend the multilib patch, there's no need to patch configure since we
+ are running autoreconf anyways
+- https://raw.github.com/bagder/c-ares/cares-1_10_0/RELEASE-NOTES
+
* Thu Apr 11 2013 Jakub Hrozek <jhrozek at redhat.com> - 1.9.1-6
- Apply an upstream patch to override AC_CONFIG_MACRO_DIR only conditionally