Accepting request 1143773 from home:AndreasStieger:branches:devel:libraries:c_c++

c-ares 1.26.0 + move tests into a build flavor to avoid gtest/gmock build loop

OBS-URL: https://build.opensuse.org/request/show/1143773
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/c-ares?expand=0&rev=59

_multibuild

@@ -0,0 +1,3 @@
+<multibuild>
+  <flavor>testsuite</flavor>
+</multibuild>

c-ares-1.25.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:71832b93a48f5ff579c505f4869120c14e57b783275367207f1a98314aa724e5
-size 1264129

c-ares-1.25.0.tar.gz.asc

@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEEJ+3q8i86vOtQ25oSXMkI/bceEsIFAmWVHp4ACgkQXMkI/bce
-EsI7GQf7BP8GV6t2Wnr8SRt+IwSEAEirTfDsTaKcRaBjMyuS3ujQ776sJtqD5yJd
-TRfQ1XfM/rhWSB5k7EU400o/5IOAGCg3cLDYtGSDfUv9fuIV+RvPavt7kkt0L2OJ
-Ib8NWL01z+BYs7GsKelfKp0CSj2+H6wWQCMswW2e2y6ccEhk8EXiypAyoFl12Q3m
-5JkVP/hYTP5a9iXjQZ5EeOL277EgfAzxbvA+3tv+7+UMcHg+4SBiAUZD66B3N6+w
-I7vxGCYwh5b8mJPUaGF8xZeZLh+Uz8CJTJE5FjaTJ6II/6zagG1V0n48c9tgKqnw
-96Vi4OfT7Q8iOedZa2VFaq6rbORMNQ==
-=7crm
------END PGP SIGNATURE-----

c-ares-1.26.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bed58c4f02b009080ebda6c2467ba469722ac6aebbf4497dc44a83d8c6194e50
+size 1298394

c-ares-1.26.0.tar.gz.asc

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEEJ+3q8i86vOtQ25oSXMkI/bceEsIFAmWz2vAACgkQXMkI/bce
+EsIrrAgAtMIrhaPGkLiy74s3dITsCyExcgl3BjISFPDM9ghTfMqNH4oB0CW38uaS
+EcoE/l8GSLnnXwwISx4R8173RMwvCY1ADpHwYY7qlx1IX8M+M9OAgMUf9YAJo2Ui
+y2tIi77Hk6QELH0K+4D3uTqZ1de6cCTkNrVS7s80YayujD0xbInXwjEz6s5yVquM
+zb4P6wRZb+mzHCmp2w+dmajs5ePam8RhuqLzsr+7aj2GJE7mqpfA9dOdLYheYXXZ
+KcCmunHA6tDAZAdRpRiqfLxl9OK3p6j8DnwU/uQ7l1u67rk7erbhgilOFuvXYDsh
+hldY+esR0Ps0fDijLoi0AwDhre9O1A==
+=yPrc
+-----END PGP SIGNATURE-----

c-ares.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat Feb  3 09:40:16 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- c-ares 1.26.0:
+  * Event Thread support. Integrators are no longer required to
+    monitor the file descriptors registered by c-ares for events
+    and call ares_process() when enabling the event thread feature
+    via ARES_OPT_EVENT_THREAD passed to ares_init_options().
+  * Added flags to are_dns_parse() to force RAW packet parsing
+  * Mark ares_fds() as deprecated
+  * Bug fixes
+- move tests into a build flavor to avoid gtest/gmock build loop
+
 -------------------------------------------------------------------
 Mon Jan  8 10:16:54 UTC 2024 - Adam Majer <adam.majer@suse.de> - 1.25
 

c-ares.spec

@@ -2,6 +2,7 @@
 # spec file for package c-ares
 #
 # Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2024 Andreas Stieger <Andreas.Stieger@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,11 +19,8 @@
 
 %define sonum   2
 %define libname libcares%{sonum}
-%if 0%{!?cmake_build:1}
-%define cmake_build make -O VERBOSE=1 %{?_smp_mflags}
-%endif
 Name:           c-ares
-Version:        1.25.0
+Version:        1.26.0
 Release:        0
 Summary:        Library for asynchronous name resolves
 License:        MIT
@@ -31,19 +29,22 @@ Source0:        https://c-ares.org/download/c-ares-%{version}.tar.gz
 Source1:        https://c-ares.org/download/c-ares-%{version}.tar.gz.asc
 Source3:        c-ares.keyring
 Source4:        baselibs.conf
+BuildRequires:  c++_compiler
 BuildRequires:  cmake
-BuildRequires:  gcc-c++
 # Needed for getservbyport_r function to work properly.
 BuildRequires:  netcfg
+BuildRequires:  pkgconfig
+%if ("@BUILD_FLAVOR@" == "testsuite")
 BuildRequires:  gmock
 BuildRequires:  gtest
-BuildRequires:  pkgconfig
+%endif
 
 %description
 c-ares is a C library that performs DNS requests and name resolves
 asynchronously. c-ares is a fork of the library named 'ares', written
 by Greg Hudson at MIT.
 
+%if ("@BUILD_FLAVOR@" != "testsuite")
 %package        utils
 Summary:        Tools for asynchronous name resolves
 
@@ -81,31 +82,38 @@ by Greg Hudson at MIT.
 This package provides the development libraries and headers needed
 to build packages that depend on c-ares.
 
+%endif
+
 %prep
 %autosetup -p1 -n c-ares-%{version}
 
 %build
 %cmake \
-%if 0%{?suse_version} >= 1500
+%if ("@BUILD_FLAVOR@" == "testsuite")
-    -DCARES_BUILD_TESTS:BOOL=ON \
+	-DCARES_BUILD_TESTS:BOOL=ON \
 %endif
-     %{nil}
+	%{nil}
-
+%if ("@BUILD_FLAVOR@" != "testsuite")
 %cmake_build
+%endif
 
 %install
+%if ("@BUILD_FLAVOR@" != "testsuite")
 %cmake_install
+%endif
+
+%if ("@BUILD_FLAVOR@" != "testsuite")
+%ldconfig_scriptlets -n %{libname}
+%endif
 
 %check
-%if 0%{?suse_version} >= 1500
+%if ("@BUILD_FLAVOR@" == "testsuite")
 pushd build
 %cmake_build -C test
 LD_LIBRARY_PATH=.%{_libdir}:./%{_lib} ./bin/arestest --gtest_filter=-*.Live*
 %endif
 
-%post   -n %{libname} -p /sbin/ldconfig
+%if ("@BUILD_FLAVOR@" != "testsuite")
-%postun -n %{libname} -p /sbin/ldconfig
-
 %files utils
 %license LICENSE.md
 %{_bindir}/adig
@@ -124,5 +132,6 @@ LD_LIBRARY_PATH=.%{_libdir}:./%{_lib} ./bin/arestest --gtest_filter=-*.Live*
 %{_mandir}/man3/ares_*.3%{?ext_man}
 %{_libdir}/pkgconfig/libcares.pc
 %{_libdir}/cmake/c-ares/
+%endif
 
 %changelog