From 2deec54a4d08cf75cea48ef9ffcdfa3dec784ac5 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Thu, 11 Mar 2021 19:57:57 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/pki-core.git#c269ddfafeb6df4f21deeef6159c4af4050b5dc2 --- pki-core.spec | 49 +++++++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/pki-core.spec b/pki-core.spec index 1850b4a..1891ab3 100644 --- a/pki-core.spec +++ b/pki-core.spec @@ -13,7 +13,7 @@ License: GPLv2 and LGPLv2 # For development (i.e. unsupported) releases, use x.y.z-0.n.. # For official (i.e. supported) releases, use x.y.z-r where r >=1. Version: 10.10.5 -Release: 1%{?_timestamp}%{?_commit_id}%{?dist} +Release: 4%{?_timestamp}%{?_commit_id}%{?dist} #global _phase -beta1 # To create a tarball from a version tag: @@ -42,7 +42,7 @@ Patch1: 0001-remove-jakarta-commons-httpclient.patch # Python ################################################################################ -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} < 9 %global python_executable /usr/libexec/platform-python %else %global python_executable /usr/bin/python3 @@ -55,7 +55,7 @@ Patch1: 0001-remove-jakarta-commons-httpclient.patch %define java_devel java-devel %define java_headless java-headless -%if 0%{?fedora} && 0%{?fedora} >= 33 +%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 %define min_java_version 1:11 %define java_home /usr/lib/jvm/java-11-openjdk %else @@ -192,7 +192,7 @@ BuildRequires: velocity BuildRequires: xalan-j2 BuildRequires: xerces-j2 -%if 0%{?rhel} +%if 0%{?rhel} && !0%{?eln} BuildRequires: resteasy >= 3.0.26 %else BuildRequires: jboss-annotations-1.2-api @@ -216,9 +216,7 @@ BuildRequires: python3-nss BuildRequires: python3-requests >= 2.6.0 BuildRequires: python3-six -%if 0%{?rhel} -# no python3-pytest-runner -%else +%if 0%{?fedora} || 0%{?rhel} >= 9 BuildRequires: python3-pytest-runner %endif @@ -233,7 +231,7 @@ BuildRequires: jna %endif BuildRequires: systemd-units -%if 0%{?rhel} +%if 0%{?rhel} && ! 0%{?eln} BuildRequires: pki-servlet-engine %else BuildRequires: tomcat >= 1:9.0.7 @@ -251,7 +249,7 @@ BuildRequires: zlib BuildRequires: zlib-devel # build dependency to build man pages -%if 0%{?fedora} && 0%{?fedora} <= 30 || 0%{?rhel} +%if 0%{?fedora} && 0%{?fedora} <= 30 || 0%{?rhel} && 0%{?rhel} < 9 BuildRequires: go-md2man %else BuildRequires: golang-github-cpuguy83-md2man @@ -315,8 +313,10 @@ Requires: pki-console = %{version} Requires: pki-javadoc = %{version} # Make certain that this 'meta' package requires the latest version(s) -# of ALL PKI clients +# of ALL PKI clients -- except for s390/s390x where 'esc' is not built +%ifnarch s390 s390x Requires: esc >= 1.1.1 +%endif # description for top-level package (unless there is a separate meta package) %if "%{name}" == "%{vendor_id}-pki" @@ -393,7 +393,7 @@ BuildArch: noarch Obsoletes: pki-base-python3 < %{version} Provides: pki-base-python3 = %{version} -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 9 %{?python_provide:%python_provide python3-pki} %endif @@ -431,7 +431,7 @@ Requires: jss >= 4.7.0 Requires: ldapjdk >= 4.22.0 Requires: pki-base = %{version}-%{release} -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} < 9 Requires: resteasy >= 3.0.26 %else Requires: resteasy-atom-provider >= 3.0.17-1 @@ -441,7 +441,7 @@ Requires: resteasy-core >= 3.0.17-1 Requires: resteasy-jackson2-provider >= 3.0.17-1 %endif -%if 0%{?fedora} && 0%{?fedora} >= 33 +%if 0%{?fedora} && 0%{?fedora} >= 33 || 0%{?rhel} >= 9 Requires: jaxb-impl >= 2.3.3 Requires: jakarta-activation >= 1.2.2 %endif @@ -504,8 +504,8 @@ Requires: python3-policycoreutils Requires: selinux-policy-targeted >= 3.13.1-159 -%if 0%{?rhel} -Requires: pki-servlet-engine >= 1:9.0.7 +%if 0%{?rhel} && ! 0%{?eln} +Requires: pki-servlet-engine %else Requires: tomcat >= 1:9.0.7 %endif @@ -849,10 +849,10 @@ java_version=`%{java_home}/bin/java -XshowSettings:properties -version 2>&1 | se # otherwise get version number java_version=`echo $java_version | sed -e 's/^1\.//' -e 's/\..*$//'` -# assume tomcat app_server +# assume tomcat app_server app_server=tomcat-8.5 -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} < 9 %{__mkdir_p} build cd build %endif @@ -887,13 +887,13 @@ cd build -DWITH_TEST:BOOL=%{?with_test:ON}%{!?with_test:OFF} \ -DBUILD_PKI_CONSOLE:BOOL=%{?with_console:ON}%{!?with_console:OFF} \ -DTHEME=%{?with_theme:%{vendor_id}} \ -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} < 9 .. %else -B %{_vpath_builddir} %endif -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 9 cd %{_vpath_builddir} %endif @@ -910,7 +910,7 @@ cd %{_vpath_builddir} %install ################################################################################ -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} < 9 cd build %else cd %{_vpath_builddir} @@ -1380,6 +1380,15 @@ fi ################################################################################ %changelog +* Thu Mar 11 2021 Dogtag PKI Team - 10.10.5-4 +- Use JDK 11 for ELN and RHEL 9 builds + +* Wed Mar 10 2021 Dogtag PKI Team - 10.10.5-3 +- Drop dependency on esc for s390(x) architectures + +* Wed Mar 10 2021 Dogtag PKI Team - 10.10.5-2 +- Use tomcat instead of pki-servlet-engine in ELN + * Thu Feb 25 2021 Alexander Scheel - 10.10.5-1 - Update to latest stable release 10.10.5 Resolves: rh-bz#1929940