Use cmake() dependencies first, and pkgconfig() dependencies second, where available

This commit is contained in:
Benjamin A. Beasley 2021-03-15 08:45:20 -04:00
parent 7adc2b7656
commit 5ab84a2f96
1 changed files with 12 additions and 7 deletions

View File

@ -77,18 +77,21 @@ BuildRequires: make
%endif %endif
BuildRequires: chrpath BuildRequires: chrpath
BuildRequires: gflags-devel BuildRequires: pkgconfig(zlib)
BuildRequires: protobuf-devel BuildRequires: cmake(gflags)
BuildRequires: pkgconfig(protobuf)
BuildRequires: protobuf-compiler BuildRequires: protobuf-compiler
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: c-ares-devel BuildRequires: c-ares-devel
BuildRequires: zlib-devel BuildRequires: pkgconfig(openssl)
BuildRequires: cmake(c-ares)
%if %{with core_tests} %if %{with core_tests}
BuildRequires: google-benchmark-devel BuildRequires: cmake(benchmark)
BuildRequires: gtest-devel BuildRequires: cmake(gtest)
BuildRequires: gmock-devel BuildRequires: pkgconfig(gmock)
BuildRequires: gperftools-devel BuildRequires: pkgconfig(libprofiler)
%endif %endif
# ~~~~ Python ~~~~ # ~~~~ Python ~~~~
@ -767,6 +770,8 @@ popd
* Mon Mar 15 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1.26.0-13 * Mon Mar 15 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1.26.0-13
- General: - General:
* Replace * with in descriptions * Replace * with in descriptions
* Use cmake() dependencies first, and pkgconfig() dependencies second, where
available
* Tue Feb 16 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1.26.0-12 * Tue Feb 16 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1.26.0-12
- C (core) and C++ (cpp): - C (core) and C++ (cpp):