From 0527179e0e76800b7c803ec19e00b79d468e4a2c Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 13 Mar 2025 14:05:45 +0000 Subject: [PATCH] import CS osgi-compendium-7.0.0-34.module_el9+1171+eb38a622 --- SPECS/osgi-compendium.spec | 86 ++++++++++++++++++++++++++++++++++---- 1 file changed, 77 insertions(+), 9 deletions(-) diff --git a/SPECS/osgi-compendium.spec b/SPECS/osgi-compendium.spec index c908d23..68615b3 100644 --- a/SPECS/osgi-compendium.spec +++ b/SPECS/osgi-compendium.spec @@ -1,18 +1,24 @@ +%bcond_with bootstrap + Name: osgi-compendium Version: 7.0.0 -Release: 4%{?dist} +Release: 34%{?dist} Summary: Interfaces and Classes for use in compiling OSGi bundles -License: ASL 2.0 +License: Apache-2.0 URL: http://www.osgi.org BuildArch: noarch +ExclusiveArch: %{java_arches} noarch Source0: https://osgi.org/download/r7/osgi.cmpn-%{version}.jar +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: maven-local -BuildRequires: mvn(javax.servlet:javax.servlet-api) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.osgi:osgi.annotation) BuildRequires: mvn(org.osgi:osgi.core) +%endif %description OSGi Compendium, Interfaces and Classes for use in compiling bundles. @@ -21,10 +27,10 @@ OSGi Compendium, 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 @@ -62,8 +68,8 @@ mv META-INF/maven/org.osgi/osgi.cmpn/pom.xml . %pom_add_dep org.osgi:osgi.annotation::provided %pom_add_dep org.osgi:osgi.core::provided -%pom_add_dep javax.servlet:javax.servlet-api::provided -# Don't compile in Jax RS and JPA support when jp_minimal is activated +# Don't compile in Servlet, Jax RS and JPA support +rm -r src/main/java/org/osgi/service/http rm -r src/main/java/org/osgi/service/jaxrs rm -r src/main/java/org/osgi/service/jpa rm -r src/main/java/org/osgi/service/transaction/control/jpa @@ -74,7 +80,6 @@ rm -r src/main/java/org/osgi/service/transaction/control/jpa %install %mvn_install - %files -f .mfiles %license LICENSE %doc about.html @@ -82,11 +87,74 @@ rm -r src/main/java/org/osgi/service/transaction/control/jpa %files javadoc -f .mfiles-javadoc %license LICENSE - %changelog +* Mon Dec 30 2024 Mikolaj Izdebski - 7.0.0-32 +- Use %%autosetup -C + +* Fri Nov 29 2024 Mikolaj Izdebski - 7.0.0-31 +- Update javapackages test plan to f42 + +* Thu Jul 18 2024 Fedora Release Engineering - 7.0.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 7.0.0-20 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 7.0.0-19 +- bump of release for for java-21-openjdk as system jdk + +* Thu Jan 25 2024 Fedora Release Engineering - 7.0.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 7.0.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 7.0.0-16 +- Convert License tag to SPDX format + +* Thu Jul 20 2023 Fedora Release Engineering - 7.0.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 7.0.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 7.0.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 7.0.0-12 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 7.0.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 7.0.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 7.0.0-9 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 7.0.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Nov 25 2020 Mat Booth - 7.0.0-7 +- Rebuild to regenerate OSGi metadata + +* 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-4 - 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-3 - Mass rebuild for javapackages-tools 201901