From 08aa4dec575f6ebd70d017a3586c6a4903b164ce Mon Sep 17 00:00:00 2001 From: Carl George Date: Tue, 11 Aug 2020 19:03:07 -0500 Subject: [PATCH] Update cmake invocation https://bugzilla.redhat.com/show_bug.cgi?id=1863298 --- brotli.spec | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/brotli.spec b/brotli.spec index 5b7f1d0..2d99dc8 100644 --- a/brotli.spec +++ b/brotli.spec @@ -1,6 +1,6 @@ Name: brotli Version: 1.0.7 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Lossless compression algorithm License: MIT @@ -74,25 +74,21 @@ chmod 644 c/tools/brotli.c %if 0%{?rhel} == 7 . /opt/rh/devtoolset-7/enable %endif -mkdir -p build -cd build -%cmake .. -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ +%cmake \ + -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ -DCMAKE_INSTALL_LIBDIR="%{_libdir}" -%make_build -cd .. +%cmake_build %py3_build %install %if 0%{?rhel} == 7 . /opt/rh/devtoolset-7/enable %endif -cd build -%make_install +%cmake_install # I couldn't find the option to not build the static libraries rm "%{buildroot}%{_libdir}/"*.a -cd .. %py3_install install -dm755 "%{buildroot}%{_mandir}/man3" cd docs @@ -106,9 +102,7 @@ done %if 0%{?rhel} == 7 . /opt/rh/devtoolset-7/enable %endif -cd build -ctest -V -cd .. +%ctest %{__python3} setup.py test %files @@ -143,6 +137,9 @@ cd .. %changelog +* Wed Aug 12 2020 Carl George - 1.0.7-14 +- Update cmake invocation rhbz#1863298 + * Sat Aug 01 2020 Fedora Release Engineering - 1.0.7-13 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild