diff --git a/xbean.spec b/xbean.spec index b8efba0f77c812ce605de834b05174a535d5e837..0fcdd5566d6e374f0987b29795229b9ad16ef4b4 100644 --- a/xbean.spec +++ b/xbean.spec @@ -1,6 +1,6 @@ Name: xbean Version: 4.9 -Release: 3 +Release: 2 Summary: A plugin based server License: ASL 2.0 URL: http://geronimo.apache.org/xbean/ @@ -11,13 +11,19 @@ BuildArch: noarch BuildRequires: maven-local, mvn(commons-logging:commons-logging-api), mvn(log4j:log4j:1.2.12), mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin), mvn(org.osgi:org.osgi.core), mvn(org.ow2.asm:asm), mvn(org.ow2.asm:asm-commons) -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) -Provides: %{name}-javadoc = %{version}-%{release} -Obsoletes: %{name}-javadoc < %{version}-%{release} +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 +Provides: %{name}-javadoc%{?_isa} %{name}-javadoc +Obsoletes: %{name}-javadoc %description The goal of XBean project is to created a plugin based server analogous to Eclipse being a plugin based IDE. @@ -33,21 +39,18 @@ rm -rf src/site/site.xml %pom_remove_dep mx4j:mx4j %pom_remove_dep -r :xbean-finder-shaded %pom_remove_dep -r :xbean-asm6-shaded -%pom_remove_dep :xbean-bundleutils + %pom_disable_module xbean-finder-shaded %pom_disable_module xbean-asm6-shaded %pom_disable_module xbean-blueprint -%pom_disable_module xbean-bundleutils + %pom_add_dep org.apache.xbean:xbean-asm-util:%{version} xbean-reflect %pom_xpath_remove 'pom:scope[text()="provided"]' xbean-reflect xbean-asm-util %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 @@ -68,10 +71,5 @@ sed -i "s|||" xbean-blueprint/pom.xml /usr/share/maven* %changelog -* Wed Mar 11 2020 yanglijin - 4.9-3 -- Type: enhancement -- ID: NA -- SUG: NA -- DESC: modify require * Mon Dec 9 2019 openEuler Buildteam - 4.9-2 - Package init