From 2d0ba53637835e03e041f9a4e307ad5f6d12a617 Mon Sep 17 00:00:00 2001 From: wang--ge Date: Thu, 3 Aug 2023 15:06:47 +0800 Subject: [PATCH] Compile with jdk11 due to jboss-modules updated --- log4j-jboss-logmanager.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/log4j-jboss-logmanager.spec b/log4j-jboss-logmanager.spec index 0b5d7bf..f1ed286 100644 --- a/log4j-jboss-logmanager.spec +++ b/log4j-jboss-logmanager.spec @@ -2,7 +2,7 @@ %global namedversion %{version}%{?namedreltag} Name: log4j-jboss-logmanager Version: 1.3.0 -Release: 1 +Release: 2 Summary: JBoss Log4j Emulation License: ASL 2.0 Url: https://github.com/jboss-logging/log4j-jboss-logmanager @@ -11,6 +11,9 @@ BuildRequires: maven-local mvn(junit:junit) mvn(log4j:log4j:12) jakarta-ma BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) maven-failsafe-plugin BuildRequires: mvn(org.jboss:jboss-parent:pom:) mvn(org.jboss.logging:jboss-logging) BuildRequires: mvn(org.jboss.logmanager:jboss-logmanager) mvn(org.jboss.modules:jboss-modules) +BuildRequires: java-11-openjdk-devel +Requires: java-11-openjdk +Requires: javapackages-tools Provides: bundled(log4j12) = 1.2.17-15 BuildArch: noarch %description @@ -30,6 +33,9 @@ sed -i 's/createSourcesJar>true/createSourcesJar>false/' pom.xml %pom_change_dep :log4j ::12 %build +export JAVA_HOME=%{_jvmdir}/java-11-openjdk +export CFLAGS="${RPM_OPT_FLAGS}" +export CXXFLAGS="${RPM_OPT_FLAGS}" %mvn_build -f %install @@ -42,6 +48,9 @@ sed -i 's/createSourcesJar>true/createSourcesJar>false/' pom.xml %license LICENSE NOTICE %changelog +* Tue Aug 01 2023 Ge Wang - 1.3.0-2 +- Compile with jdk11 due to jboss-modules updated + * Mon Jun 6 2022 liyanan - 1.3.0-1 - update to 1.3.0