diff --git a/0001-Use-import-package-instead-of-embedding-dependencies.patch b/0001-Use-import-package-instead-of-embedding-dependencies.patch new file mode 100644 index 0000000..3ffb4b5 --- /dev/null +++ b/0001-Use-import-package-instead-of-embedding-dependencies.patch @@ -0,0 +1,56 @@ +From 2269816ee0bc1e24c9efc85d9dc7025975f66673 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 + +--- + bnd.bnd | 18 +++++++++++++----- + 1 file changed, 13 insertions(+), 5 deletions(-) + +diff --git a/bnd.bnd b/bnd.bnd +index 420c0e0..b53b2f8 100644 +--- a/bnd.bnd ++++ b/bnd.bnd +@@ -1,3 +1,4 @@ ++Bundle-SymbolicName: org.apache.felix.scr + Bundle-Category: osgi + Bundle-DocURL: http://felix.apache.org/site/apache-felix-service-component-runtime.html + Bundle-Activator: org.apache.felix.scr.impl.Activator +@@ -14,10 +15,7 @@ Require-Capability: osgi.ee;\ + filter:="(|(&(osgi.ee=JavaSE)(version=1.7))(&(osgi.ee=JavaSE/compact1)(version=1.8)))" + + Export-Package: org.apache.felix.scr.component;version=1.1.0;provide:=true, \ +- org.apache.felix.scr.info;version=1.0.0;provide:=true, \ +- org.osgi.service.component;version=1.4;provide:=true, \ +- org.osgi.service.component.runtime;version=1.4;provide:=true, \ +- org.osgi.service.component.runtime.dto;version=1.4;provide:=true ++ org.apache.felix.scr.info;version=1.0.0;provide:=true + + Private-Package: org.apache.felix.scr.impl.* + +@@ -28,6 +26,17 @@ 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)", \ ++ org.osgi.framework.startlevel;version="[1.0,2)", \ ++ org.osgi.framework.wiring;version="[1.2,2)", \ ++ org.osgi.service.component;version="[1.4,1.5)", \ ++ org.osgi.service.component.runtime;version="[1.4,1.5)", \ ++ org.osgi.service.component.runtime.dto;version="[1.4,1.5)", \ ++ org.osgi.util.promise;version="[1.0,2)", \ ++ org.osgi.util.tracker;version="[1.5,2)", \ + 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 + diff --git a/felix-scr.spec b/felix-scr.spec new file mode 100644 index 0000000..16c0039 --- /dev/null +++ b/felix-scr.spec @@ -0,0 +1,61 @@ +%global bundle org.apache.felix.scr +Name: felix-scr +Version: 2.1.16 +Release: 1 +Summary: Apache Felix Service Component Runtime (SCR) +License: ASL 2.0 +URL: https://github.com/apache/felix-dev/tree/master/scr +Source0: http://archive.apache.org/dist/felix/org.apache.felix.scr-%{version}-source-release.tar.gz +Patch0: 0001-Use-import-package-instead-of-embedding-dependencies.patch +BuildRequires: maven-local mvn(net.sf.kxml:kxml2) 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) mvn(org.osgi:osgi.cmpn) >= 7.0.0 +BuildRequires: mvn(org.osgi:osgi.core) >= 7.0.0 mvn(xpp3:xpp3) +BuildArch: noarch + +%description +Implementation of the OSGi Declarative Services Specification Version 1.3 (R6). + +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +This package contains javadoc for %{name}. + +%prep +%setup -q -n %{bundle}-%{version} +%patch0 -p1 +%pom_add_dep org.osgi:osgi.cmpn:7.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:org.osgi.util.promise +%pom_remove_dep org.osgi:org.osgi.util.function +%pom_xpath_remove "pom:project/pom:dependencies/pom:dependency[pom:scope='test']" +%pom_remove_dep org.ops4j.base: +%pom_remove_plugin :maven-failsafe-plugin +%pom_remove_dep :animal-sniffer-annotations +sed -i -e '/IgnoreJRERequirement/d' src/main/java/org/apache/felix/scr/impl/manager/ThreadDump.java +%pom_add_dep xpp3:xpp3:1.1.4c:compile +%pom_change_dep net.sf.kxml:kxml2 net.sf.kxml:kxml2:2.2.2:compile +%mvn_file : felix/%{bundle} + +%build +%mvn_build -f -- -Dfelix.java.version=7 + +%install +%mvn_install + +%files -f .mfiles +%doc changelog.txt +%license LICENSE NOTICE + +%files javadoc -f .mfiles-javadoc +%license LICENSE NOTICE + +%changelog +* Wed Aug 12 2020 leiju - 2.1.16-1 +- Package init diff --git a/felix-scr.yaml b/felix-scr.yaml new file mode 100644 index 0000000..8624014 --- /dev/null +++ b/felix-scr.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: apache/felix-dev +tag_prefix: "org.apache.felix.scr-" +seperator: "." diff --git a/org.apache.felix.scr-2.1.16-source-release.tar.gz b/org.apache.felix.scr-2.1.16-source-release.tar.gz new file mode 100644 index 0000000..131c4ff Binary files /dev/null and b/org.apache.felix.scr-2.1.16-source-release.tar.gz differ