From 96b07db04e82235008f90b8e280e63346069d6e7 Mon Sep 17 00:00:00 2001 From: yanglijin Date: Wed, 11 Mar 2020 04:54:29 -0400 Subject: [PATCH] modify require --- xbean.spec | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/xbean.spec b/xbean.spec index 0fcdd55..c4e1cf6 100644 --- a/xbean.spec +++ b/xbean.spec @@ -14,14 +14,7 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin), mvn(org.osgi:o BuildRequires: mvn(org.slf4j:slf4j-api), mvn(org.eclipse:osgi), mvn(org.codehaus.groovy:groovy-all), mvn(ant:ant), mvn(commons-logging:commons-logging) BuildRequires: mvn(com.thoughtworks.qdox:qdox), mvn(org.apache.maven:maven-archiver), mvn(org.apache.maven:maven-artifact), mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-project), mvn(org.apache.maven.plugins:maven-antrun-plugin), mvn(org.apache.maven.plugins:maven-plugin-plugin) -BuildRequires: mvn(org.codehaus.plexus:plexus-archiver), mvn(org.codehaus.plexus:plexus-utils), mvn(org.springframework:spring-beans) -BuildRequires: mvn(org.springframework:spring-context), mvn(org.springframework:spring-web) -Provides: %{name}-classloader%{?_isa} %{name}-classloader -Obsoletes: %{name}-classloader -Provides: %{name}-spring%{?_isa} %{name}-spring -Obsoletes: %{name}-spring -Provides: maven-xbean-plugin%{?_isa} maven-xbean-plugin -Obsoletes: maven-xbean-plugin +BuildRequires: mvn(org.codehaus.plexus:plexus-archiver), mvn(org.codehaus.plexus:plexus-utils) Provides: %{name}-javadoc%{?_isa} %{name}-javadoc Obsoletes: %{name}-javadoc @@ -50,7 +43,10 @@ rm -rf src/site/site.xml %pom_xpath_remove pom:optional xbean-reflect xbean-asm-util sed -i 's/org\.apache\.xbean\.asm6/org.objectweb.asm/g' `find xbean-reflect -name '*.java'` - +%pom_remove_dep org.springframework: +%pom_disable_module xbean-classloader +%pom_disable_module xbean-spring +%pom_disable_module maven-xbean-plugin %pom_remove_plugin :apache-rat-plugin %pom_remove_plugin :maven-xbean-plugin xbean-classloader @@ -71,5 +67,8 @@ sed -i "s|||" xbean-blueprint/pom.xml /usr/share/maven* %changelog +* Wed Mar 11 2020 yanglijin - 4.9-3 +- modify require + * Mon Dec 9 2019 openEuler Buildteam - 4.9-2 - Package init -- Gitee