Conditional tweaks for ELN

Signed-off-by: Troy Dawson <tdawson@redhat.com>
This commit is contained in:
Troy Dawson 2020-08-26 20:38:47 +00:00
parent 2298971735
commit 59b74d58f5

View File

@ -306,7 +306,7 @@ Requires: %{py_package_prefix}-dateutil
Requires: %{py_package_prefix}-syspurpose Requires: %{py_package_prefix}-syspurpose
# rhel 8 has different naming for setuptools going forward # rhel 8 has different naming for setuptools going forward
%if (0%{?rhel} && 0%{?rhel} >= 8) %if (0%{?rhel} && 0%{?rhel} == 8)
Requires: platform-python-setuptools Requires: platform-python-setuptools
%else %else
Requires: %{py_package_prefix}-setuptools Requires: %{py_package_prefix}-setuptools
@ -752,7 +752,7 @@ python2 ./setup.py build --quiet --gtk-version=%{?gtk3:3}%{?!gtk3:2} --rpm-versi
%if (%{use_dnf} && (0%{?fedora} >= 29 || 0%{?rhel} >= 8)) %if (%{use_dnf} && (0%{?fedora} >= 29 || 0%{?rhel} >= 8))
pushd src/dnf-plugins/product-id pushd src/dnf-plugins/product-id
%cmake -DCMAKE_BUILD_TYPE="Release" %cmake -DCMAKE_BUILD_TYPE="Release"
%if (0%{?rhel}) %if (0%{?rhel} && 0%{?rhel} <= 8)
%make_build %make_build
%else %else
%cmake_build %cmake_build
@ -781,7 +781,7 @@ make -f Makefile install VERSION=%{version}-%{release} \
%if (%{use_dnf} && (0%{?fedora} >= 29 || 0%{?rhel} >= 8)) %if (%{use_dnf} && (0%{?fedora} >= 29 || 0%{?rhel} >= 8))
pushd src/dnf-plugins/product-id pushd src/dnf-plugins/product-id
mkdir -p %{buildroot}%{_libdir}/libdnf/plugins mkdir -p %{buildroot}%{_libdir}/libdnf/plugins
%if (0%{?rhel}) %if (0%{?rhel} && 0%{?rhel} <= 8)
%make_install %make_install
%else %else
%cmake_install %cmake_install