diff --git a/.gitignore b/.gitignore index 491f1f0..aa36d5c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osgi.annotation-7.0.0.jar +SOURCES/osgi.annotation-8.1.0.jar diff --git a/.osgi-annotation.metadata b/.osgi-annotation.metadata index bd16513..573d188 100644 --- a/.osgi-annotation.metadata +++ b/.osgi-annotation.metadata @@ -1 +1 @@ -c8c21fdf695aa93d8df0547c15fb6b52f3395787 SOURCES/osgi.annotation-7.0.0.jar +59d42736bcc0af2144ba5c1a12ff7c08ea4b7e12 SOURCES/osgi.annotation-8.1.0.jar diff --git a/SOURCES/osgi.annotation-7.0.0.pom b/SOURCES/osgi.annotation-8.1.0.pom similarity index 51% rename from SOURCES/osgi.annotation-7.0.0.pom rename to SOURCES/osgi.annotation-8.1.0.pom index 9b41058..a219f74 100644 --- a/SOURCES/osgi.annotation-7.0.0.pom +++ b/SOURCES/osgi.annotation-8.1.0.pom @@ -3,34 +3,33 @@ 4.0.0 org.osgi osgi.annotation - 7.0.0 - OSGi Annotation Release 7, Annotations for use in compiling bundles + 8.1.0 + OSGi Annotation Release 8, Annotations for use in compiling bundles org.osgi:osgi.annotation - https://www.osgi.org/ + https://docs.osgi.org/ - OSGi Alliance - https://www.osgi.org/ + Eclipse Foundation Apache-2.0 - http://www.apache.org/licenses/LICENSE-2.0 + https://opensource.org/licenses/Apache-2.0 repo - Apache License, Version 2.0 + This program and the accompanying materials are made available under the terms of the Apache License, Version 2.0. - https://osgi.org/gitweb/build.git - scm:git:https://osgi.org/git/build.git - scm:git:https://osgi.org/git/build.git - hudson-build.core-1432 + https://github.com/osgi/osgi + scm:git:https://github.com/osgi/osgi.git + scm:git:git@github.com:osgi/osgi.git + 8.0.0.1 osgi - info@osgi.org - OSGi Alliance - OSGi Alliance + osgi-wg@eclipse.org + OSGi Working Group + Eclipse Foundation https://www.osgi.org/ diff --git a/SPECS/osgi-annotation.spec b/SPECS/osgi-annotation.spec index 27b43a2..fa74cb0 100644 --- a/SPECS/osgi-annotation.spec +++ b/SPECS/osgi-annotation.spec @@ -1,32 +1,38 @@ -Name: osgi-annotation -Version: 7.0.0 -Release: 3%{?dist} -Summary: Annotations for use in compiling OSGi bundles +%bcond_with bootstrap + +Name: osgi-annotation +Version: 8.1.0 +Release: 15%{?dist} +Summary: Annotations for use in compiling OSGi bundles +License: Apache-2.0 +URL: https://www.osgi.org +BuildArch: noarch +ExclusiveArch: %{java_arches} 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) +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: maven-local +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +%endif %description Annotations for use in compiling OSGi bundles. This package is not normally needed at run-time. %package javadoc -Summary: API documentation for %{name} +Summary: API documentation for %{name} %description javadoc -This package contains the API documentation for %{name}. +API documentation for %{name}. %prep -%setup -c -q +%autosetup -p1 -c mkdir -p src/main/java && mv OSGI-OPT/src/org src/main/java @@ -57,25 +63,100 @@ cp -p %{SOURCE1} pom.xml %mvn_alias org.osgi:osgi.annotation org.osgi:org.osgi.annotation %build -%mvn_build +%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install %mvn_install %files -f .mfiles -%license LICENSE -%doc about.html +%license META-INF/LICENSE META-INF/NOTICE %files javadoc -f .mfiles-javadoc -%doc LICENSE +%license META-INF/LICENSE META-INF/NOTICE %changelog +* Mon Dec 30 2024 Mikolaj Izdebski - 8.1.0-13 +- Use %%autosetup -C + +* Fri Nov 29 2024 Mikolaj Izdebski - 8.1.0-12 +- Update javapackages test plan to f42 + +* Thu Jul 18 2024 Fedora Release Engineering - 8.1.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 8.1.0-6 +- Rebuilt for java-21-openjdk as system jdk + +* Tue Feb 20 2024 Marian Koncek - 8.1.0-5 +- Update Java source/target to 1.8 + +* Thu Jan 25 2024 Fedora Release Engineering - 8.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 8.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 8.1.0-2 +- Convert License tag to SPDX format + +* Thu Aug 17 2023 Mikolaj Izdebski - 8.1.0-1 +- Update to upstream version 8.1.0 + +* Thu Jul 20 2023 Fedora Release Engineering - 8.0.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 8.0.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 8.0.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 8.0.1-4 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 8.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 02 2021 Mikolaj Izdebski - 8.0.1-2 +- Set explicit Java compiler source/target levels to 1.7 + +* Wed Oct 13 2021 Mikolaj Izdebski - 8.0.1-1 +- Update to upstream version 8.0.1 + +* Thu Jul 22 2021 Fedora Release Engineering - 8.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 8.0.0-2 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 7.0.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Jan 15 2021 Marian Koncek - 8.0.0-1 +- Update to upstream version 8.0.0 + +* Tue Jul 28 2020 Fedora Release Engineering - 7.0.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 11 2020 Jiri Vanek - 7.0.0-5 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jan 29 2020 Fedora Release Engineering - 7.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Nov 05 2019 Mikolaj Izdebski - 7.0.0-3 - Mass rebuild for javapackages-tools 201902 +* Thu Jul 25 2019 Fedora Release Engineering - 7.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 24 2019 Mikolaj Izdebski - 7.0.0-2 - Mass rebuild for javapackages-tools 201901 +* Fri Feb 01 2019 Fedora Release Engineering - 7.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Nov 20 2018 Marian Koncek - 7.0.0-1 - Update to upstream version 7.0.0