diff --git a/maven-osgi.spec b/maven-osgi.spec index 87f587d..ad512f9 100644 --- a/maven-osgi.spec +++ b/maven-osgi.spec @@ -1,6 +1,6 @@ Name: maven-osgi Version: 0.2.0 -Release: 10%{?dist} +Release: 11%{?dist} # Maven-shared defines maven-osgi version as 0.3.0 Epoch: 1 Summary: Library for Maven-OSGi integration @@ -17,9 +17,9 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt BuildRequires: maven-local BuildRequires: mvn(biz.aQute:bndlib) -BuildRequires: mvn(org.apache.maven.shared:maven-plugin-testing-harness) -BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) BuildRequires: mvn(org.apache.maven:maven-project) +BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) +BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) Obsoletes: maven-shared-osgi < %{epoch}:%{version}-%{release} Provides: maven-shared-osgi = %{epoch}:%{version}-%{release} @@ -30,10 +30,8 @@ Library for Maven-OSGi integration. This is a replacement package for maven-shared-osgi %package javadoc -Group: Documentation Summary: Javadoc for %{name} -Requires: jpackage-utils - + %description javadoc API documentation for %{name}. @@ -42,6 +40,8 @@ API documentation for %{name}. %setup -q cp -p %{SOURCE1} LICENSE +sed -i 's/import aQute\.lib\.osgi/import aQute.bnd.osgi/g' src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java + # Replace plexus-maven-plugin with plexus-component-metadata %pom_xpath_set "pom:plugin[pom:artifactId[text()='plexus-maven-plugin']]//pom:goal[text()='descriptor']" generate-metadata %pom_xpath_set "pom:artifactId[text()='plexus-maven-plugin']" plexus-component-metadata @@ -62,6 +62,9 @@ cp -p %{SOURCE1} LICENSE %changelog +* Wed Jul 08 2015 Michael Simacek - 1:0.2.0-11 +- Build agains aQute bndlib 2.4 + * Wed Jun 17 2015 Fedora Release Engineering - 1:0.2.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild