From 2edfcf74163d77dc1cc0b0961d5625d4bd3bf648 Mon Sep 17 00:00:00 2001 From: Björn Esser Date: Aug 19 2020 17:40:07 +0000 Subject: Drop some EPEL8 conditionals, as they are not needed anymore --- diff --git a/AusweisApp2.spec b/AusweisApp2.spec index 153ccc8..6f049b1 100644 --- a/AusweisApp2.spec +++ b/AusweisApp2.spec @@ -142,12 +142,6 @@ This package contains the API-documentation for %{name}. %build -%if !(0%{?fedora} || 0%{?rhel} > 8) -# Needed for EPEL-8. -mkdir -p %{_vpath_builddir} -pushd %{_vpath_builddir} -%endif - # The project does not ship any libraries that are meant to be # consumed externally. Thus we disable shared libs explicitly. # See: https://github.com/Governikus/AusweisApp2/pull/24 @@ -159,22 +153,16 @@ pushd %{_vpath_builddir} -DINTEGRATED_SDK:BOOL=OFF \ -DPYTHON_EXECUTABLE:STRING=%{__python3} \ -DSELFPACKER:BOOL=OFF \ - -G Ninja \ -%if !(0%{?fedora} || 0%{?rhel} > 8) - .. -popd -%endif -%if (0%{?fedora} || 0%{?rhel} > 8) + -G Ninja %cmake_build +%if (0%{?fedora} || 0%{?rhel} > 8) # Documentation. %cmake_build --target inst inte notes sdk %if %{with doxy} %cmake_build --target doxy %endif %else -%ninja_build -C %{_vpath_builddir} - # Documentation. %ninja_build -C %{_vpath_builddir} inst inte notes sdk %if %{with doxy} @@ -184,11 +172,7 @@ popd %install -%if (0%{?fedora} || 0%{?rhel} > 8) %cmake_install -%else -%ninja_install -C %{_vpath_builddir} -%endif %find_lang %{lc_name} --with-qt # Generate man-page.