From 588ea67f4589ec3b3674fdf94c3d89ea8db772a7 Mon Sep 17 00:00:00 2001 From: starlet-dx <15929766099@163.com> Date: Mon, 21 Aug 2023 20:38:49 +0800 Subject: [PATCH] Fix build failure caused by jboss-classfilewriter upgrade to 1.3.0 --- weld-core.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/weld-core.spec b/weld-core.spec index b638d9d..d5404a8 100644 --- a/weld-core.spec +++ b/weld-core.spec @@ -2,7 +2,7 @@ %global namedversion %{version}%{?namedreltag} Name: weld-core Version: 2.3.5 -Release: 3 +Release: 4 Summary: Reference Implementation for JSR-299: Contexts and Dependency Injection (CDI) License: ASL 2.0 and (CDDL-1.0 or GPLv2 with exceptions) and LGPLv2+ and MIT and OFL-1.1 URL: http://weld.cdi-spec.org/ @@ -34,6 +34,9 @@ BuildRequires: mvn(org.jboss.spec.javax.servlet:jboss-servlet-api_3.1_spec BuildRequires: mvn(org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec) BuildRequires: mvn(org.jboss.weld:weld-api) mvn(org.jboss.weld:weld-parent:pom:) BuildRequires: mvn(org.jboss.weld:weld-spi) +BuildRequires: java-11-openjdk-devel +Requires: java-11-openjdk +Requires: javapackages-tools Provides: bundled(fontawesome-fonts) = 4.2.0 Provides: bundled(fontawesome-fonts-web) = 4.2.0 %description @@ -80,6 +83,9 @@ sed -i -e 's/InstantiationException/InstantiationException, NoSuchMethodExceptio environments/servlet/core/src/main/java/org/jboss/weld/environment/tomcat/{Weld,}ForwardingInstanceManager.java %build +export JAVA_HOME=%{_jvmdir}/java-11-openjdk +export CFLAGS="${RPM_OPT_FLAGS}" +export CXXFLAGS="${RPM_OPT_FLAGS}" %mvn_build -f %install @@ -91,6 +97,9 @@ sed -i -e 's/InstantiationException/InstantiationException, NoSuchMethodExceptio %files javadoc -f .mfiles-javadoc %changelog +* Mon Aug 21 2023 yaoxin - 2.3.5-4 +- Fix build failure caused by jboss-classfilewriter upgrade to 1.3.0 + * Mon Aug 8 2022 Chenyx - 2.3.5-3 - License compliance rectification