From bcd0dbcad6bbdc1993728b7c4fba5250ebbe7766 Mon Sep 17 00:00:00 2001
From: Igor Raits <ignatenkobrain@fedoraproject.org>
Date: Sat, 4 Jul 2020 20:46:12 +0200
Subject: [PATCH] Improve compatibility with new CMake macro

Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
---
 c-ares.spec | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/c-ares.spec b/c-ares.spec
index b1f3822..5ac1640 100644
--- a/c-ares.spec
+++ b/c-ares.spec
@@ -26,16 +26,14 @@ by Greg Hudson at MIT.
 
 %package devel
 Summary: Development files for c-ares
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 This package contains the header files and libraries needed to
 compile applications or shared objects that use c-ares.
 
 %prep
-%setup -q
-%patch0 -p1 -b .optflags
+%autosetup -p1
 
 cp %{SOURCE1} .
 f=CHANGES ; iconv -f iso-8859-1 -t utf-8 $f -o $f.utf8 ; mv $f.utf8 $f
@@ -45,31 +43,33 @@ f=CHANGES ; iconv -f iso-8859-1 -t utf-8 $f -o $f.utf8 ; mv $f.utf8 $f
 # %%configure --enable-shared --disable-static \
 #            --disable-dependency-tracking
 %if %{use_cmake}
-%{cmake} -DCMAKE_INSTALL_LIBDIR:PATH="%{_libdir}" -DCARES_BUILD_TOOLS:BOOL=OFF .
+%{cmake} -DCMAKE_INSTALL_LIBDIR:PATH="%{_libdir}" -DCARES_BUILD_TOOLS:BOOL=OFF
+%cmake_build
 %else
 autoreconf -if
 %configure --enable-shared --disable-static \
            --disable-dependency-tracking
-%endif
 %{__make} %{?_smp_mflags}
+%endif
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libcares.la
-
 %if %{use_cmake}
+%cmake_install
 # When we used autotooling, we got man pages installed automagically
 # but no cmake helpers were generated.
 # Now, we use cmake, so we have to copy the man pages manually.
 mkdir -p %{buildroot}%{_mandir}/man3
 cp -a ares_*.3 %{buildroot}%{_mandir}/man3/
+%else
+make DESTDIR=$RPM_BUILD_ROOT install
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libcares.la
 %endif
 
 %ldconfig_scriptlets
 
 %files
-%doc README.cares CHANGES NEWS LICENSE
+%license LICENSE
+%doc README.cares CHANGES NEWS
 %{_libdir}/*.so.*
 
 %files devel