Merge modular branch

This commit is contained in:
Mikolaj Izdebski 2021-05-14 09:14:17 +02:00
commit 9bc158deb8
3 changed files with 30 additions and 16 deletions

2
.gitignore vendored
View File

@ -5,3 +5,5 @@
/*.src.rpm
/osgi.annotation-7.0.0.jar
/osgi.annotation-7.0.0.pom
/osgi.annotation-8.0.0.jar
/osgi.annotation-8.0.0.pom

View File

@ -1,19 +1,24 @@
Name: osgi-annotation
Version: 7.0.0
Release: 7%{?dist}
Summary: Annotations for use in compiling OSGi bundles
%bcond_with bootstrap
Name: osgi-annotation
Version: 8.0.0
Release: 1%{?dist}
Summary: Annotations for use in compiling OSGi bundles
License: ASL 2.0
URL: https://www.osgi.org
BuildArch: noarch
License: ASL 2.0
URL: http://www.osgi.org/
# Upstream project is behind an account registration system with no anonymous
# read access, so we download the source from maven central instead
Source0: http://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}.jar
Source1: http://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}.pom
Source0: https://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}.jar
Source1: https://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}.pom
BuildArch: noarch
BuildRequires: maven-local
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: maven-local
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
%endif
%description
Annotations for use in compiling OSGi bundles. This package is not normally
@ -65,8 +70,6 @@ cp -p %{SOURCE1} pom.xml
%files -f .mfiles
%license LICENSE
%doc about.html
%dir %{_javadir}/osgi-annotation
%dir %{_mavenpomdir}/osgi-annotation
%files javadoc -f .mfiles-javadoc
%doc LICENSE
@ -75,6 +78,9 @@ cp -p %{SOURCE1} pom.xml
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Jan 15 2021 Marian Koncek <mkoncek@redhat.com> - 8.0.0-1
- Update to upstream version 8.0.0
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
@ -84,9 +90,15 @@ cp -p %{SOURCE1} pom.xml
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-3
- Mass rebuild for javapackages-tools 201902
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-2
- Mass rebuild for javapackages-tools 201901
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

View File

@ -1,2 +1,2 @@
SHA512 (osgi.annotation-7.0.0.jar) = b976bceed56e88854550318f21e71c2812b220d1b86dd3f4d34b4319b983b9c659cba2d29f044efaa243af5775cc4f9d2283bf60836b7632ce8f6bc396325c2c
SHA512 (osgi.annotation-7.0.0.pom) = 6bfa35e1cd81a2e659061ec6b65fde0f048bce9b247424897bf18cf822b9d397f8dece42064f96cdacfe72c744408832210cdb9bf96f49e57f73af957ed3f991
SHA512 (osgi.annotation-8.0.0.jar) = b71d7ce3cb2a927b277cdb1974b31755d3b634511f85012ec289adef8dd3ec39d97ea60fd8d8e51f3daf9ad779887d91c4007e56ca9d9bcc683475f6c7a6ab54
SHA512 (osgi.annotation-8.0.0.pom) = d4d7ed67b5f366c0c30e7c7d71a174267ef9a9b5d391ed8064183408a8aa07e15b77f06e9a05476316b267e060654cd80ed84301e57d0c75ca748a5158aaf146