Backport IPv6 NS patch and several small packaging fixes

- Backport the fix for usage of IPv6 nameserves from 1.7 branch
- Use default defattr
- Comment patches
- Convert the CHANGES file to UTF8

c-ares.spec

@@ -1,15 +1,19 @@
 Summary: A library that performs asynchronous DNS operations
 Name: c-ares
 Version: 1.6.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://daniel.haxx.se/projects/c-ares/
 Source0: http://daniel.haxx.se/projects/c-ares/c-ares-%{version}.tar.gz
 Source1: LICENSE
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Backported fix for #597287
 Patch0: domain-search-order-1.6.0.patch
+# Pass correct CFLAGS to the make machinery (no relevat BZ entry)
 Patch1: c-ares-1.6.0-optflags.patch
+# Backported fix for #560116
+Patch2: use-ipv6-nameservers-1.6.0.patch
 
 %description
 c-ares is a C library that performs DNS requests and name resolves 
@@ -30,7 +34,9 @@ compile applications or shared objects that use c-ares.
 %setup -q
 %patch0 -p1 -b .domain
 %patch1 -p1 -b .optflags
+%patch2 -p1 -b .ipv6
 cp %{SOURCE1} .
+f=CHANGES ; iconv -f iso-8859-1 -t utf-8 $f -o $f.utf8 ; mv $f.utf8 $f
 
 %build
 %configure --enable-shared  --disable-static \
@@ -50,12 +56,12 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc README README.cares CHANGES NEWS LICENSE
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-, root, root, 0755)
+%defattr(-, root, root, -)
 %{_includedir}/ares.h
 %{_includedir}/ares_dns.h
 %{_includedir}/ares_version.h
@@ -64,6 +70,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/ares_*
 
 %changelog
+* Thu Aug 5 2010 Jakub Hrozek <jhrozek@redhat.com> - 1.6.0-3
+- Backport the fix for usage of IPv6 nameserves from 1.7 branch
+- Use default defattr
+- Comment patches
+- Convert the CHANGES file to UTF8
+
 * Thu Jun 2 2010 Jakub Hrozek <jhrozek@redhat.com> - 1.6.0-2
 - Backport the fix the order of search domains from 1.7 branch
 - Add patch do honor our CFLAGS (patch by Ville Skyttä)