diff --git a/.gitignore b/.gitignore index 430639c..fbd06a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ +/results_* +/*.src.rpm + /LICENSE-2.0.txt /maven-osgi-0.2.0.tar.xz diff --git a/maven-osgi.spec b/maven-osgi.spec index b7a9ada..e219e5f 100644 --- a/maven-osgi.spec +++ b/maven-osgi.spec @@ -1,6 +1,6 @@ Name: maven-osgi Version: 0.2.0 -Release: 17%{?dist} +Release: 18%{?dist} # Maven-shared defines maven-osgi version as 0.3.0 Epoch: 1 Summary: Library for Maven-OSGi integration @@ -21,13 +21,9 @@ 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} - %description Library for Maven-OSGi integration. -This is a replacement package for maven-shared-osgi %package javadoc Summary: Javadoc for %{name} @@ -38,6 +34,7 @@ API documentation for %{name}. %prep %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 @@ -46,22 +43,27 @@ sed -i 's/import aQute\.lib\.osgi/import aQute.bnd.osgi/g' src/main/java/org/apa %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 + %build # Tests depend on binary JARs which were removed from sources %mvn_build -f + %install %mvn_install + %files -f .mfiles -%doc LICENSE -%dir %{_javadir}/%{name} +%license LICENSE %files javadoc -f .mfiles-javadoc -%doc LICENSE +%license LICENSE %changelog +* Wed Oct 09 2019 Fabio Valentini - 1:0.2.0-18 +- Release bump for package unretirement. + * Fri Feb 01 2019 Fedora Release Engineering - 1:0.2.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild