diff --git a/prison.spec b/prison.spec index fd58a9c..968d701 100644 --- a/prison.spec +++ b/prison.spec @@ -1,11 +1,10 @@ -## (re)enable qt5 support -#global qt5 1 +%undefine __cmake_in_source_build Name: prison Summary: A Qt-based barcode abstraction library Version: 1.1.1 -Release: 16%{?dist} +Release: 17%{?dist} License: MIT URL: https://projects.kde.org/projects/kdesupport/prison @@ -66,32 +65,13 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release} %build -mkdir %{_target_platform} -pushd %{_target_platform} -%{cmake} .. -popd -make %{?_smp_mflags} -C %{_target_platform} +%cmake -%if 0%{?qt5} -mkdir %{_target_platform}-qt5 -pushd %{_target_platform}-qt5 -%{cmake_kf5} .. \ - -DQT5_BUILD:BOOL=ON -popd -make %{?_smp_mflags} -C %{_target_platform}-qt5 -%endif +%cmake_build %install -make install/fast DESTDIR=%{buildroot} -C %{_target_platform} - -%if 0%{?qt5} -make install/fast DESTDIR=%{buildroot} -C %{_target_platform}-qt5 - -# fix up prison-qt5 include paths -sed -i -e 's|#include - 1.1.1-17 +- FTBFS, use new cmake macros, drop qt5 support (in kf5-prison these days) + * Sat Aug 01 2020 Fedora Release Engineering - 1.1.1-16 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild