Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/c-ares.git#fcb6e5afb0fbe108bbd8894600962f54b76f9eea
This commit is contained in:
DistroBaker 2020-12-10 01:08:05 +01:00
parent 3f82cd3fff
commit 7678e753da
4 changed files with 6 additions and 21 deletions

1
.gitignore vendored
View File

@ -12,3 +12,4 @@ c-ares-1.7.3.tar.gz
/c-ares-1.16.0.tar.gz
/c-ares-1.16.1.tar.gz
/c-ares-1.17.0.tar.gz
/c-ares-1.17.1.tar.gz

View File

@ -1,11 +0,0 @@
diff -up c-ares-1.17.0/include/CMakeLists.txt.ares_dns c-ares-1.17.0/include/CMakeLists.txt
--- c-ares-1.17.0/include/CMakeLists.txt.ares_dns 2020-11-17 10:52:31.669935103 -0500
+++ c-ares-1.17.0/include/CMakeLists.txt 2020-11-17 10:52:42.507979110 -0500
@@ -3,6 +3,6 @@ CONFIGURE_FILE (ares_build.h.cmake ${PRO
# Headers installation target
IF (CARES_INSTALL)
- SET (CARES_HEADERS ares.h ares_version.h "${PROJECT_BINARY_DIR}/ares_build.h" ares_rules.h)
+ SET (CARES_HEADERS ares.h ares_version.h "${PROJECT_BINARY_DIR}/ares_build.h" ares_rules.h ../src/lib/ares_dns.h)
INSTALL (FILES ${CARES_HEADERS} COMPONENT Devel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
ENDIF ()

View File

@ -2,20 +2,14 @@
Summary: A library that performs asynchronous DNS operations
Name: c-ares
Version: 1.17.0
Version: 1.17.1
Release: 1%{?dist}
License: MIT
URL: http://c-ares.haxx.se/
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
# Missing from 1.17.0 tarball
# Should be fixed in 1.17.1
# https://github.com/c-ares/c-ares/issues/373
Source2: https://raw.githubusercontent.com/c-ares/c-ares/master/c-ares-config.cmake.in
Source3: https://raw.githubusercontent.com/c-ares/c-ares/master/libcares.pc.cmake
Patch0: 0001-Use-RPM-compiler-options.patch
Patch1: c-ares-1.17.0-cmake-ares_dns_h.patch
BuildRequires: gcc
%if %{use_cmake}
BuildRequires: cmake
@ -42,8 +36,6 @@ compile applications or shared objects that use c-ares.
%autosetup -p1
cp %{SOURCE1} .
cp %{SOURCE2} .
cp %{SOURCE3} .
f=CHANGES ; iconv -f iso-8859-1 -t utf-8 $f -o $f.utf8 ; mv $f.utf8 $f
%build
@ -89,6 +81,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libcares.la
%{_mandir}/man3/ares_*
%changelog
* Fri Nov 20 2020 Tom Callaway <spot@fedoraproject.org> - 1.17.1-1
- update to 1.17.1
* Tue Nov 17 2020 Tom Callaway <spot@fedoraproject.org> - 1.17.0-1
- update to 1.17.0

View File

@ -1 +1 @@
SHA512 (c-ares-1.17.0.tar.gz) = 366a668c2c8bc089155e473a0197bc74c7ef785caa4a9eb3c2cf14e99be6d2640f4d0e3310917ad571b5f7562866671b2aa4a27adb739fb59f7e5c5e0007b5ea
SHA512 (c-ares-1.17.1.tar.gz) = b11887bcc9274d368088e1a8b6aca62414f20675cf0bc58e948f54fa04c327c39dd23cefe7509eec6397db14b550a3f6b77f5c18b3d735b3eef48ce2da1dcd00