diff --git a/pki-core.spec b/pki-core.spec index 323d6af449f2456bcb431a01fc05d5c3a3ada0b3..e4b39e0e8f582b76bc4ccc5c44e0aad696b694b4 100644 --- a/pki-core.spec +++ b/pki-core.spec @@ -3,7 +3,7 @@ Name: pki-core Version: 11.0.0 -Release: 8 +Release: 9 Summary: The PKI Core Package License: GPLv2 and LGPLv2 URL: http://www.dogtagpki.org/ @@ -13,7 +13,11 @@ Source1: https://github.com/cpuguy83/go-md2man/archive/v1.0.10.tar.g Patch0001: 0001-Disable-access-to-external-entities-when-parsing-XML.patch Patch3000: backport-CVE-2023-4727-Fix-token-authentication-bypass-vulner.patch +%ifarch sw_64 +BuildRequires: make cmake >= 2.8.9-1 gcc-c++ zip java-17-openjdk-devel java-17-openjdk-headless +%else BuildRequires: make cmake >= 2.8.9-1 gcc-c++ zip java-latest-openjdk-devel java-latest-openjdk-headless +%endif BuildRequires: ldapjdk >= 4.21.0 apache-commons-cli apache-commons-codec apache-commons-io BuildRequires: apache-commons-lang jakarta-commons-httpclient glassfish-jaxb-api slf4j BuildRequires: slf4j-jdk14 nspr-devel nss-devel >= 3.36.1 python3-lxml python3-sphinx @@ -37,7 +41,11 @@ manage enterprise Public Key Infrastructure deployments. %package -n pki-symkey Summary: The PKI Symmetric Key Package +%ifarch sw_64 +Requires: java-17-openjdk-headless jpackage-utils >= 0:1.7.5-10 jss >= 4.6.0 +%else Requires: java-latest-openjdk-headless jpackage-utils >= 0:1.7.5-10 jss >= 4.6.0 +%endif Requires: nss >= 3.38.0 Conflicts: pki-symkey < %{version} pki-javadoc < %{version} Conflicts: pki-server-theme < %{version} pki-console-theme < %{version} @@ -71,7 +79,11 @@ This package is included in the Python 3 PKI client library . %package -n pki-base-java Summary: The PKI Base Java Package BuildArch: noarch +%ifarch sw_64 +Requires: java-17-openjdk-headless apache-commons-cli apache-commons-codec +%else Requires: java-latest-openjdk-headless apache-commons-cli apache-commons-codec +%endif Requires: apache-commons-io apache-commons-lang apache-commons-logging Requires: jakarta-commons-httpclient glassfish-jaxb-api slf4j slf4j-jdk14 Requires: jpackage-utils >= 0:1.7.5-10 jss >= 4.6.0 pki-base = %{version} @@ -208,7 +220,11 @@ The PKI console is a Java application used to manage the PKI server. tar -xf %{SOURCE1} %build +%ifarch sw_64 +openjdk_latest_version=`rpm -qi java-17-openjdk-headless | grep Version | cut -b 15-16` +%else openjdk_latest_version=`rpm -qi java-latest-openjdk-headless | grep Version | cut -b 15-16` +%endif java_home=/usr/lib/jvm/jre-${openjdk_latest_version}-openjdk tomcat_version=`/usr/sbin/tomcat version | sed -n 's/Server number: *\([0-9]\+\.[0-9]\+\).*/\1/p'` @@ -457,6 +473,9 @@ fi %endif %changelog +* Mon May 12 2025 mahailiang - 11.0.0-9 +- fix sw_64 build error + * Sun Oct 13 2024 liningjie - 11.0.0-8 - Fix CVE-2023-4727