From 21d75962612b038bd342558fcd2515fdaa15c744 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 18 Aug 2020 15:21:27 +0200 Subject: F33 build --- libxlsxwriter.spec | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/libxlsxwriter.spec b/libxlsxwriter.spec index 2fe4917..d086c0a 100644 --- a/libxlsxwriter.spec +++ b/libxlsxwriter.spec @@ -16,7 +16,7 @@ Name: %{libname} Summary: A C library for creating Excel XLSX files Version: 0.9.9 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD URL: https://github.com/%{gh_owner}/%{gh_project}/ @@ -83,22 +83,33 @@ for %{name}. %if 0%{?rhel} == 6 || 0%{?rhel} == 7 %cmake3 \ -DBUILD_TESTS=ON \ - . + -S . %else %cmake \ -DBUILD_TESTS=ON \ - . + -S . %endif -make %{_smp_mflags} +%if 0%{?cmake_build:1} +%cmake_build +%else +make %{?_smp_mflags} +%endif %check +%if 0%{?ctest:1} +%ctest +%else make test - +%endif %install -make install DESTDIR="%{buildroot}" +%if 0%{?cmake_install:1} +%cmake_install +%else +make install DESTDIR=%{buildroot} +%endif %if 0%{?fedora} < 28 && 0%{?rhel} < 8 @@ -121,6 +132,9 @@ make install DESTDIR="%{buildroot}" %changelog +* Tue Aug 18 2020 Remi Collet - 0.9.9-2 +- F33 build + * Tue Aug 18 2020 Remi Collet - 0.9.9-1 - update to 0.9.9 -- cgit