开源软件构建与测试

Changes of Revision 20

_service:tar_scm:lucene.spec Changed

@@ -15,6 +15,7 @@
 %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 @@
 
 %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 @@
 
 %package benchmark
 Summary:             Lucene Benchmarking Module
+Requires:            glassfish-servlet-api < 4.0.0
 %description benchmark
 Lucene Benchmarking Module.
 
@@ -120,12 +124,14 @@
 
 %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.
 
@@ -367,6 +373,7 @@
 %changelog
 * Fri May 10 2024 Dingli Zhang <dingli@iscas.ac.cn> - 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 <sunguoshuai@huawei.com> - 0:7.7.0-1
 - Upgrade to 7.7.0