diff --git a/0001-Use-import-package-instead-of-embedding-dependencies.patch b/0001-Use-import-package-instead-of-embedding-dependencies.patch index 3ffb4b5..e032c52 100644 --- a/0001-Use-import-package-instead-of-embedding-dependencies.patch +++ b/0001-Use-import-package-instead-of-embedding-dependencies.patch @@ -1,14 +1,14 @@ -From 2269816ee0bc1e24c9efc85d9dc7025975f66673 Mon Sep 17 00:00:00 2001 +From 5c822613993f2193590252f1eb75c67e7cdf1c87 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 6 Mar 2019 10:19:20 +0000 -Subject: [PATCH] Use import-package instead of embedding dependencies +Subject: [PATCH 1/2] Use import-package instead of embedding dependencies --- - bnd.bnd | 18 +++++++++++++----- - 1 file changed, 13 insertions(+), 5 deletions(-) + bnd.bnd | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/bnd.bnd b/bnd.bnd -index 420c0e0..b53b2f8 100644 +index 420c0e0..ae3fadb 100644 --- a/bnd.bnd +++ b/bnd.bnd @@ -1,3 +1,4 @@ @@ -28,11 +28,10 @@ index 420c0e0..b53b2f8 100644 Private-Package: org.apache.felix.scr.impl.* -@@ -28,6 +26,17 @@ Private-Package: org.apache.felix.scr.impl.* +@@ -28,6 +26,16 @@ Private-Package: org.apache.felix.scr.impl.* # R4.0 version 1.2 is sufficient. # optional import for Gogo annotations Import-Package: \ -+ org.kxml2.io,org.xmlpull.v1, \ + org.osgi.dto;version="[1.0,2)", \ + org.osgi.framework;version="[1.8,2)", \ + org.osgi.framework.dto;version="[1.8,2)", \ @@ -46,11 +45,6 @@ index 420c0e0..b53b2f8 100644 org.osgi.service.cm;version="[1.6,2)";resolution:=optional, \ org.osgi.service.log;version="[1.3,2)";resolution:=optional, \ org.osgi.service.metatype;version="[1.2,2)";resolution:=optional, \ -@@ -40,4 +49,3 @@ DynamicImport-Package: \ - org.osgi.service.log;version="[1.3,2)", \ - org.osgi.service.metatype;version="[1.1,2)" - --Embed-Dependency: kxml2;inline=org/kxml2/io/KXmlParser.class|org/xmlpull/v1/XmlPull** -- -2.20.1 +2.21.1 diff --git a/felix-scr.spec b/felix-scr.spec index 4452461..3a992a9 100644 --- a/felix-scr.spec +++ b/felix-scr.spec @@ -2,28 +2,31 @@ Name: felix-scr Version: 2.1.16 -Release: 1%{?dist} +Release: 6%{?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 Source0: http://archive.apache.org/dist/felix/%{bundle}-%{version}-source-release.tar.gz -Source1: osgi.cmpn.tar.gz # Don't embed deps, use import-package instead Patch0: 0001-Use-import-package-instead-of-embedding-dependencies.patch +# Drop dep on kxml/xpp, use the system SAX implementation instead +Patch1: 0002-Drop-the-dependencies-on-kxml-xpp3.patch + +# SCL-specific sources +Source100: osgi.cmpn.tar.gz + BuildArch: noarch BuildRequires: maven-local -BuildRequires: mvn(net.sf.kxml:kxml2) 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.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). @@ -37,6 +40,7 @@ This package contains javadoc for %{name}. %prep %setup -q -n %{bundle}-%{version} %patch0 -p1 +%patch1 -p1 # All these OSGi deps are provided in the compendium jar %pom_add_dep org.osgi:osgi.cmpn:7.0.0:provided @@ -57,21 +61,14 @@ This package contains javadoc for %{name}. %pom_remove_dep :animal-sniffer-annotations sed -i -e '/IgnoreJRERequirement/d' src/main/java/org/apache/felix/scr/impl/manager/ThreadDump.java -# Upstream kxml bundles xpp3. Since RHBZ#1299774 kxml no longer -# bundles xpp3 packages. Add the dep to the pom. kxml requires xpp3 -# already. -%pom_add_dep xpp3:xpp3:1.1.4c:compile -# And since we are not bundling kxml, need to make it 'compile' scope -# instead of 'provided' scope so it's pulled in by RPM requires -%pom_change_dep net.sf.kxml:kxml2 net.sf.kxml:kxml2:2.2.2:compile - %mvn_file : felix/%{bundle} -tar xf %{SOURCE1} +# Extract SCL-specific sources +tar xf %{SOURCE100} %build # No test deps availables e.g org.ops4j.pax.url:pax-url-wrap -%mvn_build -f -- -Dfelix.java.version=7 +%mvn_build --xmvn-javadoc -f -- -Dfelix.java.version=7 %install %mvn_install @@ -84,6 +81,22 @@ tar xf %{SOURCE1} %license LICENSE NOTICE %changelog +* Fri Jul 10 2020 Jiri Vanek - 2.1.16-6 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Tue Jun 16 2020 Jie Kang - 2.1.16-5 +- Build javadoc with --xmvn-javadoc + +* Tue Jan 28 2020 Fedora Release Engineering - 2.1.16-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jan 23 2020 Mat Booth - 2.1.16-3 +- Drop requirement on kxml and xpp, patch to use the JDK SAX implementation + instead + +* Thu Jul 25 2019 Fedora Release Engineering - 2.1.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Wed Mar 06 2019 Mat Booth - 2.1.16-1 - Update to latest upstream release for OSGi R7 support @@ -140,4 +153,4 @@ tar xf %{SOURCE1} - Changed to vcs source as tarball no longer available * Sun Oct 06 2013 gil cattaneo 1.6.2-1 -- initial rpm +- initial rpm \ No newline at end of file diff --git a/sources b/sources index a5be918..57f172e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (org.apache.felix.scr-2.1.16-source-release.tar.gz) = 1a6b04f93c39ddf42680474576407fc0f1998661216939e195c0f243992addff2704c07f7a9c102a81731798ec6df661bdd6c16230ef68eb38783b1880afa3ad -SHA512 (osgi.cmpn.tar.gz) = 1719b62569cdaab1660f835e93710ca361b17d135b6fa992dbfb0279dc612996ca1f8660c83513ff79174fb839e610fe7e63bcb10fd00b2f4967a43a9e08ca07 +SHA1 (org.apache.felix.scr-2.1.16-source-release.tar.gz) = f13e2097b5be922b9c9ae46f1594af27518f2d1c +SHA1 (osgi.cmpn.tar.gz) = f37ac7768baa8e096270b62c04fa518fa449c710