From 8962071855c4c66dd45abc31f73ac6862ecf1dda Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Aug 13 2020 06:44:55 +0000 Subject: fix cmake macros usage, FTBFS #1863670 --- diff --git a/librabbitmq.spec b/librabbitmq.spec index b5dc2b2..765f6ba 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -1,6 +1,6 @@ # 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/ # @@ -17,7 +17,7 @@ Name: %{libname} Summary: Client library for AMQP Version: 0.10.0 -Release: 4%{?dist} +Release: 3%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c @@ -76,13 +76,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 @@ -92,7 +100,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 %files @@ -114,12 +126,8 @@ make test %changelog -* Sat Aug 01 2020 Fedora Release Engineering - 0.10.0-4 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 0.10.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild +* Thu Aug 13 2020 Remi Collet - 0.10.0-3 +- fix cmake macros usage, FTBFS #1863670 * Wed Jan 29 2020 Fedora Release Engineering - 0.10.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild