Update cmake invocation

https://bugzilla.redhat.com/show_bug.cgi?id=1863298
This commit is contained in:
Carl George 2020-08-11 19:03:07 -05:00
parent 30d7a6f4bf
commit 08aa4dec57

View File

@ -1,6 +1,6 @@
Name: brotli Name: brotli
Version: 1.0.7 Version: 1.0.7
Release: 13%{?dist} Release: 14%{?dist}
Summary: Lossless compression algorithm Summary: Lossless compression algorithm
License: MIT License: MIT
@ -74,25 +74,21 @@ chmod 644 c/tools/brotli.c
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
. /opt/rh/devtoolset-7/enable . /opt/rh/devtoolset-7/enable
%endif %endif
mkdir -p build %cmake \
cd build -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
%cmake .. -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
-DCMAKE_INSTALL_LIBDIR="%{_libdir}" -DCMAKE_INSTALL_LIBDIR="%{_libdir}"
%make_build %cmake_build
cd ..
%py3_build %py3_build
%install %install
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
. /opt/rh/devtoolset-7/enable . /opt/rh/devtoolset-7/enable
%endif %endif
cd build %cmake_install
%make_install
# I couldn't find the option to not build the static libraries # I couldn't find the option to not build the static libraries
rm "%{buildroot}%{_libdir}/"*.a rm "%{buildroot}%{_libdir}/"*.a
cd ..
%py3_install %py3_install
install -dm755 "%{buildroot}%{_mandir}/man3" install -dm755 "%{buildroot}%{_mandir}/man3"
cd docs cd docs
@ -106,9 +102,7 @@ done
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
. /opt/rh/devtoolset-7/enable . /opt/rh/devtoolset-7/enable
%endif %endif
cd build %ctest
ctest -V
cd ..
%{__python3} setup.py test %{__python3} setup.py test
%files %files
@ -143,6 +137,9 @@ cd ..
%changelog %changelog
* Wed Aug 12 2020 Carl George <carl@george.computer> - 1.0.7-14
- Update cmake invocation rhbz#1863298
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-13 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-13
- Second attempt - Rebuilt for - Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild