Fix FTBFS

This commit is contained in:
Than Ngo 2020-09-07 16:44:12 +02:00
parent a7c1b6c129
commit 08e1b60ff8

View File

@ -3,13 +3,10 @@
%global python3 python%{python3_pkgversion}
%endif
# set this until when/if we port to new cmake macros
%global __cmake_in_source_build 1
Name: lensfun
Version: 0.3.2
Summary: Library to rectify defects introduced by photographic lenses
Release: 29%{?dist}
Release: 30%{?dist}
License: LGPLv3 and CC-BY-SA
URL: https://lensfun.github.io/
@ -104,23 +101,20 @@ sed -i.shbang \
%build
mkdir %{_target_platform}
pushd %{_target_platform}
%{cmake} .. \
%cmake \
-DBUILD_DOC:BOOL=ON \
-DBUILD_TESTS:BOOL=%{?tests:ON}%{!?tests:OFF} \
-DCMAKE_BUILD_TYPE:STRING=Release \
-DCMAKE_INSTALL_DOCDIR:PATH=%{_pkgdocdir} \
%{?!python3:-DINSTALL_HELPER_SCRIPTS:BOOL=OFF}
popd
%make_build -C %{_target_platform}
%cmake_build
make doc -C %{_target_platform}
%install
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%cmake_install
# create/own /var/lib/lensfun-updates
mkdir -p %{buildroot}/var/lib/lensfun-updates
@ -128,15 +122,14 @@ mkdir -p %{buildroot}/var/lib/lensfun-updates
## unpackaged files
# omit g-lensfun-update-data because it needs gksudo which we don't ship
rm -fv %{buildroot}%{_bindir}/g-lensfun-update-data \
%{buildroot}%{_mandir}/man1/g-lensfun-update-data.*
%{buildroot}%{_mandir}/man1/g-lensfun-update-data.* \
%{buildroot}%{_docdir}/%{name}/doxygen.svg
%check
%if 0%{?tests}
pushd %{_target_platform}
export CTEST_OUTPUT_ON_FAILURE=1
ctest -vv
popd
%ctest
%endif
@ -173,6 +166,9 @@ popd
%changelog
* Mon Sep 07 2020 Than Ngo <than@redhat.com> - 0.3.2-30
- Fix FTBFS
* Tue Aug 11 2020 Rex Dieter <rdieter@fedoraproject.org> - 0.3.2-29
- fix FTBFS