catch needs to be in the devel build for dependant packages to build their tests bz#1510392

This commit is contained in:
James Hogarth 2017-11-07 10:48:03 +00:00
parent c433682e11
commit 706b6a37e3
1 changed files with 7 additions and 7 deletions

View File

@ -7,7 +7,7 @@
Name: leatherman
Version: 1.3.0
Release: 3%{?dist}
Release: 4%{?dist}
Summary: A collection of C++ and CMake utility libraries
# leatherman is ASL 2.0
@ -64,11 +64,9 @@ rm -rf vendor/nowide
-DBOOST_LIBRARYDIR=%{_libdir}/boost%{?boost_version} \
%endif
-DLEATHERMAN_SHARED=ON \
-DLEATHERMAN_DEBUG=ON \
-DLEATHERMAN_USE_CATCH=OFF \
-DLEATHERMAN_ENABLE_TESTING=OFF
-DLEATHERMAN_DEBUG=ON
%__make
%make_build
%install
%make_install
@ -80,8 +78,6 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%find_lang %{name}_logging
%find_lang %{name}_locale
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@ -102,6 +98,10 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%changelog
* Tue Nov 07 2017 James Hogarth <james.hogarth@gmail.com> - 1.3.0-4
- Restore catch to devel build (bz#1510392)
- Use make_build macro as per review
* Sun Oct 29 2017 Haïkel Guémar <hguemar@fedoraproject.org> - 1.3.0-3
- Merge with James spec + keep compatibility with CentOS SIGs