From 6d227ebed793e05e1cd0188ed469fca6585e1add Mon Sep 17 00:00:00 2001 From: Dingli Zhang Date: Mon, 8 Apr 2024 16:35:25 +0800 Subject: [PATCH] Update spec for RISCV64 due to OOM compilation error --- lucene.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/lucene.spec b/lucene.spec index 5bc84f4..22e95ba 100644 --- a/lucene.spec +++ b/lucene.spec @@ -2,7 +2,7 @@ Summary: High-performance, full-featured text search engine Name: lucene Version: 7.7.0 -Release: 1 +Release: 2 Epoch: 0 License: ASL 2.0 URL: http://lucene.apache.org/ @@ -15,6 +15,7 @@ BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) %if %{without jp_minimal} BuildRequires: mvn(com.carrotsearch.randomizedtesting:randomizedtesting-runner) BuildRequires: mvn(com.ibm.icu:icu4j) mvn(commons-codec:commons-codec) +BuildRequires: mvn(commons-logging:commons-logging) mvn(junit:junit) BuildRequires: mvn(commons-logging:commons-logging) mvn(javax.servlet:javax.servlet-api) BuildRequires: mvn(javax.servlet:servlet-api) mvn(junit:junit) BuildRequires: mvn(net.sourceforge.nekohtml:nekohtml) mvn(org.antlr:antlr4-runtime) @@ -90,11 +91,13 @@ Lucene Sandbox Module. %package parent Summary: Parent POM for Lucene +Requires: glassfish-servlet-api < 4.0.0 %description parent Parent POM for Lucene. %package solr-grandparent Summary: Lucene Solr grandparent POM +Requires: glassfish-servlet-api < 4.0.0 %description solr-grandparent Lucene Solr grandparent POM. @@ -105,6 +108,7 @@ Codecs for older versions of Lucene. %package benchmark Summary: Lucene Benchmarking Module +Requires: glassfish-servlet-api < 4.0.0 %description benchmark Lucene Benchmarking Module. @@ -120,12 +124,14 @@ Apache Lucene Java Test Framework. %package expressions Summary: Lucene Expressions Module +Requires: glassfish-servlet-api < 4.0.0 %description expressions Dynamically computed values to sort/facet/search on based on a pluggable grammar. %package demo Summary: Lucene Demo Module +Requires: glassfish-servlet-api < 4.0.0 %description demo Demo for Apache Lucene Java. @@ -283,6 +289,9 @@ popd pushd lucene %pom_disable_module opennlp analysis popd +%if "%{_arch}" == "riscv64" +export JAVA_TOOL_OPTIONS="-Xmx4096m" +%endif %mvn_build -s -f %install @@ -362,6 +371,10 @@ popd %license lucene/LICENSE.txt lucene/NOTICE.txt %changelog +* Fri May 10 2024 Dingli Zhang - 0:7.7.0-2 +- Update spec for RISCV64 due to OOM compilation error +- Add Requires of several packages to resolve conflicts during installation + * Tue Aug 18 2020 Sunguoshuai - 0:7.7.0-1 - Upgrade to 7.7.0 -- Gitee