diff --git a/.gitignore b/.gitignore index f767032..a1a6778 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /org.apache.felix.scr-*.tar.gz /.build-*.log +/*.src.rpm diff --git a/felix-scr.spec b/felix-scr.spec index 06475b9..0ecdaf0 100644 --- a/felix-scr.spec +++ b/felix-scr.spec @@ -1,8 +1,8 @@ %global bundle org.apache.felix.scr Name: felix-scr -Version: 2.0.12 -Release: 3%{?dist} +Version: 2.0.14 +Release: 1%{?dist} Summary: Apache Felix Service Component Runtime (SCR) License: ASL 2.0 URL: http://felix.apache.org/documentation/subprojects/apache-felix-service-component-runtime.html @@ -20,14 +20,12 @@ BuildRequires: mvn(org.apache.felix:felix-parent:pom:) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.felix:org.apache.felix.gogo.runtime) BuildRequires: mvn(org.apache.felix:org.apache.felix.shell) -BuildRequires: mvn(org.apache.felix:org.apache.felix.utils) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) BuildRequires: mvn(org.osgi:osgi.annotation) BuildRequires: mvn(org.osgi:osgi.cmpn) BuildRequires: mvn(org.osgi:osgi.core) BuildRequires: mvn(xpp3:xpp3) - %description Implementation of the OSGi Declarative Services Specification Version 1.3 (R6). @@ -45,6 +43,8 @@ This package contains javadoc for %{name}. %pom_add_dep org.osgi:osgi.cmpn:6.0.0:provided %pom_remove_dep org.osgi:org.osgi.service.component %pom_remove_dep org.osgi:org.osgi.service.cm +%pom_remove_dep org.osgi:org.osgi.service.log +%pom_remove_dep org.osgi:org.osgi.service.metatype %pom_remove_dep org.osgi:org.osgi.namespace.extender %pom_remove_dep org.osgi:osgi.promise @@ -81,6 +81,9 @@ sed -i -e '/IgnoreJRERequirement/d' src/main/java/org/apache/felix/scr/impl/mana %license LICENSE NOTICE %changelog +* Thu Apr 26 2018 Mat Booth - 2.0.14-1 +- Update to latest upstream release + * Wed Feb 07 2018 Fedora Release Engineering - 2.0.12-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/osgi-metadata.patch b/osgi-metadata.patch index 096b0c1..045b0ec 100644 --- a/osgi-metadata.patch +++ b/osgi-metadata.patch @@ -17,9 +17,9 @@ - org.osgi.util.promise;version=1.0 + org.apache.felix.scr.info;version=1.0.0;provide:=true - Private-Package: org.apache.felix.scr.impl.*, \ - org.apache.felix.utils.extender -@@ -32,11 +28,20 @@ + Private-Package: org.apache.felix.scr.impl.* + +@@ -31,11 +27,20 @@ # optional import for Gogo annotations # The Felix Shell support is optional Import-Package: \ @@ -40,7 +40,7 @@ org.apache.felix.service.command;resolution:=optional, \ org.apache.felix.shell;provide:=true;resolution:=optional, \ * -@@ -45,4 +50,3 @@ +@@ -44,4 +49,3 @@ org.osgi.service.cm;version="[1.2,2)", \ org.osgi.service.metatype;version="[1.1,2)" diff --git a/sources b/sources index c506785..b9d7d24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (org.apache.felix.scr-2.0.12-source-release.tar.gz) = b64117da5c6eb7091cf92c7a83ccdf0874675cb73fb7e0d9f76e82995e001dadc80adf7616c40058334fc93d54ade61287597ce2b146daabb515cbba1e13fc81 +SHA512 (org.apache.felix.scr-2.0.14-source-release.tar.gz) = 0d66374a209abebbaedc8d9714543df27abf062ae25fb5e2bb15d344f4044ec0e378d38fd505c270700c0851e33912581dc8592bc46c08b443d06e6fd9d07348