rpms
/
felix-scr
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import felix-scr-2.1.16-1.module+el8.1.1+4657+f90e8085

This commit is contained in:
CentOS Sources 2020-02-06 11:46:15 -05:00 committed by Andrew Lukoshko
commit e4fde00489
4 changed files with 203 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.felix-scr.metadata Normal file
View File

@ -0,0 +1,2 @@
f13e2097b5be922b9c9ae46f1594af27518f2d1c SOURCES/org.apache.felix.scr-2.1.16-source-release.tar.gz
f37ac7768baa8e096270b62c04fa518fa449c710 SOURCES/osgi.cmpn.tar.gz

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
SOURCES/org.apache.felix.scr-2.1.16-source-release.tar.gz
SOURCES/osgi.cmpn.tar.gz

56
SOURCES/0001-Use-import-package-instead-of-embedding-dependencies.patch Normal file
View File

@ -0,0 +1,56 @@
From 2269816ee0bc1e24c9efc85d9dc7025975f66673 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
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

143
SPECS/felix-scr.spec Normal file
View File

@ -0,0 +1,143 @@
%global bundle org.apache.felix.scr
Name: felix-scr
Version: 2.1.16
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
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
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).
%package javadoc
Summary: Javadoc for %{name}
%description javadoc
This package contains javadoc for %{name}.
%prep
%setup -q -n %{bundle}-%{version}
%patch0 -p1
# All these OSGi deps are provided in the compendium jar
%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
# Many test deps are not in Fedora
%pom_xpath_remove "pom:project/pom:dependencies/pom:dependency[pom:scope='test']"
%pom_remove_dep org.ops4j.base:
%pom_remove_plugin :maven-failsafe-plugin
# Animal sniffer is unnecessary since we always know JRE level on Fedora
%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}
%build
# No test deps availables e.g org.ops4j.pax.url:pax-url-wrap
%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 Mar 06 2019 Mat Booth <mat.booth@redhat.com> - 2.1.16-1
- Update to latest upstream release for OSGi R7 support
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.14-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.14-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Jul 11 2018 Mat Booth <mat.booth@redhat.com> - 2.0.14-2
- Rebuilt
* Thu Apr 26 2018 Mat Booth <mat.booth@redhat.com> - 2.0.14-1
- Update to latest upstream release
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.12-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Wed Jun 21 2017 Roland Grunberg <rgrunber@redhat.com> - 2.0.12-1
- Update to latest upstream release.
- Resolves rhbz#1455048.
* Fri Jun 16 2017 Mat Booth <mat.booth@redhat.com> - 2.0.10-2
- Remove SCL macros forbidden in Fedora
- Avoid bundling org.osgi classes
* Tue May 16 2017 Mat Booth <mat.booth@redhat.com> - 2.0.10-1
- Update to latest upstream release
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Thu Feb 02 2017 Mat Booth <mat.booth@redhat.com> - 2.0.8-1
- Update to latest upstream release
- Regenerate BRs and ensure there is an R on kxml
- Actually use license macro
* Thu Feb 04 2016 Severin Gehwolf <sgehwolf@redhat.com> - 1.6.2-6
- Add dep on xpp3 since it's now unbundled from kxml2. See RHBZ#1299774.
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Thu Sep 10 2015 jkang@redhat.com - 1.6.2-4
- SCL-ize package
* Wed Jul 08 2015 jkang@redhat.com - 1.6.2-3
- Added LICENSE and NOTICE files
* Wed Jun 17 2015 Jie Kang <jkang@redhat.com> - 1.6.2-2
- Changed to vcs source as tarball no longer available
* Sun Oct 06 2013 gil cattaneo <puntogil@libero.it> 1.6.2-1
- initial rpm