diff --git a/.gitignore b/.gitignore index b6b0b3a..d6377c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osgi.core-7.0.0.jar +SOURCES/osgi.core-8.0.0.jar diff --git a/.osgi-core.metadata b/.osgi-core.metadata index 0a67f4c..cb021cb 100644 --- a/.osgi-core.metadata +++ b/.osgi-core.metadata @@ -1 +1 @@ -7545eab9bd1f85e9f1162865a7281c8becb417f2 SOURCES/osgi.core-7.0.0.jar +daa42a0e96c3b881e8c330a413813983e92d2426 SOURCES/osgi.core-8.0.0.jar diff --git a/SPECS/osgi-core.spec b/SPECS/osgi-core.spec index 12c909c..ac4c6ac 100644 --- a/SPECS/osgi-core.spec +++ b/SPECS/osgi-core.spec @@ -1,16 +1,23 @@ +%bcond_with bootstrap + Name: osgi-core -Version: 7.0.0 -Release: 4%{?dist} +Version: 8.0.0 +Release: 30%{?dist} Summary: OSGi Core API -License: ASL 2.0 +License: Apache-2.0 URL: https://www.osgi.org BuildArch: noarch +ExclusiveArch: %{java_arches} noarch -Source0: https://osgi.org/download/r7/osgi.core-%{version}.jar +Source0: https://docs.osgi.org/download/r8/osgi.core-%{version}.jar +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.osgi:osgi.annotation) +%endif %description OSGi Core, Interfaces and Classes for use in compiling bundles. @@ -19,10 +26,10 @@ OSGi Core, Interfaces and Classes for use in compiling bundles. Summary: API documentation for %{name} %description javadoc -This package provides %{summary}. +API documentation for %{name}. %prep -%setup -q -c +%autosetup -p1 -c # Delete pre-built binaries rm -r org @@ -59,12 +66,11 @@ mv META-INF/maven/org.osgi/osgi.core/pom.xml . %mvn_alias : org.osgi:org.osgi.core %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 @@ -73,9 +79,73 @@ mv META-INF/maven/org.osgi/osgi.core/pom.xml . %license LICENSE %changelog +* Mon Dec 30 2024 Mikolaj Izdebski - 8.0.0-27 +- Use %%autosetup -C + +* Fri Nov 29 2024 Mikolaj Izdebski - 8.0.0-26 +- Update javapackages test plan to f42 + +* Thu Jul 18 2024 Fedora Release Engineering - 8.0.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 8.0.0-13 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 8.0.0-12 +- bump of release for for java-21-openjdk as system jdk + +* Thu Jan 25 2024 Fedora Release Engineering - 8.0.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 8.0.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 8.0.0-9 +- Convert License tag to SPDX format + +* Thu Jul 20 2023 Fedora Release Engineering - 8.0.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 8.0.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 8.0.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 8.0.0-5 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 8.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* 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-6 +- 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-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 11 2020 Jiri Vanek - 7.0.0-4 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jan 29 2020 Fedora Release Engineering - 7.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Nov 05 2019 Mikolaj Izdebski - 7.0.0-4 - Mass rebuild for javapackages-tools 201902 +* Thu Jul 25 2019 Fedora Release Engineering - 7.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 24 2019 Mikolaj Izdebski - 7.0.0-3 - Mass rebuild for javapackages-tools 201901