Drop python 2 for RHEL8+ as well; Drop old java conditional

This commit is contained in:
Orion Poplawski 2020-06-19 21:09:57 -06:00
parent 360a86dd58
commit 1c84837765

View File

@ -19,7 +19,7 @@
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
%if 0%{?fedora} >= 32 %if 0%{?fedora} >= 32 || 0%{?rhel} >= 8
%bcond_with python2 %bcond_with python2
%else %else
%bcond_without python2 %bcond_without python2
@ -135,11 +135,7 @@ Contains development headers and libraries for openmpi.
%package java %package java
Summary: Java library Summary: Java library
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
Requires: java-headless Requires: java-headless
%else
Requires: java
%endif
%description java %description java
Java library. Java library.