From 79668cfa9fd02ba99fbe57dfe60836f70defbaa3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 13 Aug 2020 08:52:35 +0200 Subject: fix cmake macros usage, FTBFS #1863670 --- librabbitmq.spec | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/librabbitmq.spec b/librabbitmq.spec index ce12678..c4c1226 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -3,7 +3,7 @@ # # Fedora spec file for librabbitmq # -# Copyright (c) 2012-2019 Remi Collet +# Copyright (c) 2012-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -26,7 +26,7 @@ Name: %{libname} %endif Summary: Client library for AMQP Version: 0.10.0 -Release: 1%{?dist} +Release: 3%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c @@ -104,13 +104,21 @@ sed -e '/test_basic/d' -i tests/CMakeLists.txt %cmake \ -DBUILD_TOOLS_DOCS:BOOL=ON \ -DBUILD_STATIC_LIBS:BOOL=ON \ - . + -S . +%if 0%{?cmake_build:1} +%cmake_build +%else make %{_smp_mflags} +%endif %install +%if 0%{?cmake_install:1} +%cmake_install +%else make install DESTDIR="%{buildroot}" +%endif rm %{buildroot}%{_libdir}/%{libname}.a @@ -120,7 +128,11 @@ rm %{buildroot}%{_libdir}/%{libname}.a grep @ %{buildroot}%{_libdir}/pkgconfig/librabbitmq.pc && exit 1 : upstream tests +%if 0%{?ctest:1} +%ctest +%else make test +%endif %if 0%{?fedora} < 28 && 0%{?rhel} < 8 @@ -151,6 +163,9 @@ make test ## NOTICE: 0.8.0 available in RHEL 7.5, 0.9.0 in RHEL 8.0 %changelog +* Thu Aug 13 2020 Remi Collet - 0.10.0-3 +- fix cmake macros usage, FTBFS #1863670 + * Mon Dec 2 2019 Remi Collet - 0.10.0-1 - update to 0.10.0 -- cgit