Update to OSGi R7

This commit is contained in:
Mat Booth 2019-03-06 11:00:18 +00:00
parent c4f1bd9f37
commit 9ba62c91c4
3 changed files with 20 additions and 13 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/osgi.core-6.0.0-sources.jar /osgi.core-6.0.0-sources.jar
/osgi.core-7.0.0.jar

View File

@ -1,20 +1,19 @@
Name: osgi-core Name: osgi-core
Version: 6.0.0 Version: 7.0.0
Release: 8%{?dist} Release: 1%{?dist}
License: ASL 2.0
Summary: OSGi Core API Summary: OSGi Core API
License: ASL 2.0
URL: https://www.osgi.org URL: https://www.osgi.org
Source0: https://repo1.maven.org/maven2/org/osgi/osgi.core/%{version}/osgi.core-%{version}-sources.jar
Source1: https://repo1.maven.org/maven2/org/osgi/osgi.core/%{version}/osgi.core-%{version}.pom
BuildArch: noarch BuildArch: noarch
Source0: https://osgi.org/download/r7/osgi.core-%{version}.jar
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.osgi:org.osgi.annotation) BuildRequires: mvn(org.osgi:osgi.annotation)
%description %description
OSGi Core Release 6, Interfaces and Classes for use in compiling bundles. OSGi Core, Interfaces and Classes for use in compiling bundles.
%package javadoc %package javadoc
Summary: API documentation for %{name} Summary: API documentation for %{name}
@ -22,13 +21,17 @@ Summary: API documentation for %{name}
%description javadoc %description javadoc
This package provides %{summary}. This package provides %{summary}.
%prep %prep
%setup -q -c %setup -q -c
cp -p %SOURCE1 pom.xml # Delete pre-built binaries
mkdir -p src/main/java rm -r org
mv org src/main/java/ find -name '*.class' -delete
mkdir -p src/main/{java,resources}
mv OSGI-OPT/src/org src/main/java/
mv META-INF/maven/org.osgi/osgi.core/pom.xml .
%pom_xpath_inject pom:project ' %pom_xpath_inject pom:project '
<packaging>bundle</packaging> <packaging>bundle</packaging>
@ -68,6 +71,9 @@ mv org src/main/java/
%license LICENSE %license LICENSE
%changelog %changelog
* Wed Mar 06 2019 Mat Booth <mat.booth@redhat.com> - 7.0.0-1
- Update to OSGi R7
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-8 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

View File

@ -1 +1 @@
1d6cda750e77e31fac814f5b7a5aa851 osgi.core-6.0.0-sources.jar SHA512 (osgi.core-7.0.0.jar) = 60c5e59fc1d33bcb63a0be1151af04321bf9c6c08faa910cf1a29f74b9b58d43edc2d528182edd0884d2bd44403840d8d50b6c012411892391fe28c0a2102ffb