diff --git a/idm-console-framework.spec b/idm-console-framework.spec index c4f0fb5..e2bf50a 100644 --- a/idm-console-framework.spec +++ b/idm-console-framework.spec @@ -1,18 +1,14 @@ -%define java_devel java-18-openjdk-devel -%define java_headless java-18-openjdk-headless -%define java_home /usr/lib/jvm/jre-18-openjdk - Name: idm-console-framework Summary: Identity Management Console Framework URL: https://github.com/dogtagpki/idm-console-framework/ License: LGPLv2 BuildArch: noarch Version: 2.0.0 -Release: 1 +Release: 2 Source: https://github.com/dogtagpki/idm-console-framework/archive/v%{version}/idm-console-framework-%{version}.tar.gz BuildRequires: jss >= 5.0 ldapjdk >= 5.0 -BuildRequires: %{java_devel} ant >= 1.6.2 -Requires: %{java_headless} jss >= 5.0 ldapjdk >= 5.0 +BuildRequires: java-latest-openjdk-devel ant >= 1.6.2 +Requires: java-latest-openjdk-headless jss >= 5.0 ldapjdk >= 5.0 %description A Java Management Console framework used for remote server management. @@ -20,7 +16,10 @@ A Java Management Console framework used for remote server management. %autosetup -n idm-console-framework-%{version}%{?_phase} -p 1 %build -%{ant} \ +openjdk_latest_version=`rpm -qi java-latest-openjdk-headless | grep Version | cut -b 15-16` +home_path=`ls /usr/lib/jvm | grep java-${openjdk_latest_version}-openjdk-${openjdk_latest_version}` +export JAVA_HOME=/usr/lib/jvm/${home_path} +ant \ -Dlib.dir=%{_libdir} \ -Dbuilt.dir=`pwd`/built \ -Dclassdest=%{_javadir} @@ -38,6 +37,9 @@ install -m644 built/release/jars/idm-console-* $RPM_BUILD_ROOT%{_javadir} %{_javadir}/idm-console-nmclf_en.jar %changelog +* Thu Jan 19 2023 caodongxia - 2.0.0-2 +- Change the JDK version + * Wed Jun 15 2022 liyanan - 2.0.0-1 - Update to 2.0.0