diff --git a/tomcatjss.spec b/tomcatjss.spec index e7e42295e0418e41dbe2112c08d126e33f8f21f3..ae4bbfae67e5d4e561896afbed52317e414a298c 100644 --- a/tomcatjss.spec +++ b/tomcatjss.spec @@ -2,13 +2,20 @@ Name: tomcatjss Summary: Apache Tomcat of JSS Connector URL: http://www.dogtagpki.org/wiki/TomcatJSS License: LGPLv2+ -BuildArch: noarch Version: 8.2.0 -Release: 2 +Release: 3 Source: https://github.com/dogtagpki/tomcatjss/archive/refs/tags/tomcatjss-8.2.0.tar.gz +%ifarch sw_64 +BuildRequires: ant apache-commons-lang3 java-17-openjdk-devel slf4j +%else BuildRequires: ant apache-commons-lang3 java-latest-openjdk-devel slf4j +%endif BuildRequires: slf4j-jdk14 jss >= 4.6.0 tomcat >= 1:9.0.7 +%ifarch sw_64 +Requires: apache-commons-lang3 java-17-openjdk-headless jpackage-utils >= 0:1.7.5-15 slf4j slf4j-jdk14 jss >= 5.2.0 tomcat >= 1:9.0.7 +%else Requires: apache-commons-lang3 java-latest-openjdk-headless jpackage-utils >= 0:1.7.5-15 slf4j slf4j-jdk14 jss >= 5.2.0 tomcat >= 1:9.0.7 +%endif Conflicts: pki-base < 10.10.0 %define _sharedstatedir /var/lib @@ -19,7 +26,11 @@ Apache Tomcat of JSS Connector. %autosetup -n tomcatjss-%{version} -p 1 %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 home_path=`ls /usr/lib/jvm | grep java-${openjdk_latest_version}-openjdk-${openjdk_latest_version}` export JAVA_HOME=/usr/lib/jvm/${home_path} ./build.sh \ @@ -30,7 +41,11 @@ export JAVA_HOME=/usr/lib/jvm/${home_path} dist %install +%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 home_path=`ls /usr/lib/jvm | grep java-${openjdk_latest_version}-openjdk-${openjdk_latest_version}` export JAVA_HOME=/usr/lib/jvm/${home_path} ./build.sh \ @@ -48,6 +63,9 @@ export JAVA_HOME=/usr/lib/jvm/${home_path} %{_javadir}/* %changelog +* Mon May 12 2025 mahailiang - 8.2.0-3 +- fix sw_64 build error + * Wed Nov 13 2024 wangkai <13474090681@163.com> - 8.2.0-2 - Fix build fail for tomcat upgrade