From 2fa8a934f3c5bda4c2b21aa595d96bd0b7905d42 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 13 Mar 2025 13:53:25 +0000 Subject: [PATCH] import CS jakarta-activation-2.1.3-10.module_el9+1171+eb38a622 --- .gitignore | 2 +- .jakarta-activation.metadata | 2 +- SPECS/jakarta-activation.spec | 131 ++++++++++++++++++++++------------ 3 files changed, 87 insertions(+), 48 deletions(-) diff --git a/.gitignore b/.gitignore index 84f4c4d..c044839 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/jaf-1.2.2.tar.gz +SOURCES/jaf-2.1.3.tar.gz diff --git a/.jakarta-activation.metadata b/.jakarta-activation.metadata index 9efd3e1..8942334 100644 --- a/.jakarta-activation.metadata +++ b/.jakarta-activation.metadata @@ -1 +1 @@ -34af0b68133cadd23f16f2b34d2031b8d3a97959 SOURCES/jaf-1.2.2.tar.gz +118e4666c22f802c72982038df51eae827c04eba SOURCES/jaf-2.1.3.tar.gz diff --git a/SPECS/jakarta-activation.spec b/SPECS/jakarta-activation.spec index 18162b3..634f168 100644 --- a/SPECS/jakarta-activation.spec +++ b/SPECS/jakarta-activation.spec @@ -1,86 +1,126 @@ +%bcond_with bootstrap + Name: jakarta-activation -Version: 1.2.2 -Release: 8%{?dist} -Summary: Jakarta Activation Specification and Implementation -License: BSD -URL: https://eclipse-ee4j.github.io/jaf/ +Version: 2.1.3 +Release: 10%{?dist} +Summary: Jakarta Activation API +# the whole project is licensed under (EPL-2.0 or BSD) +# the source code additionally can be licensed under GPLv2 with exceptions +# we only ship built source code +License: EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only WITH Classpath-exception-2.0 +URL: https://jakarta.ee/specifications/activation/2.1/ BuildArch: noarch -ExclusiveArch: aarch64 ppc64le s390x x86_64 noarch +ExclusiveArch: %{java_arches} noarch -Source0: https://github.com/eclipse-ee4j/jaf/archive/%{version}/jaf-%{version}.tar.gz +Source0: https://github.com/jakartaee/jaf-api/archive/%{version}/jaf-%{version}.tar.gz +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: maven-local -BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +%endif %description -Jakarta Activation lets you take advantage of standard services to: -determine the type of an arbitrary piece of data; encapsulate access to -it; discover the operations available on it; and instantiate the +Jakarta Activation defines a set of standard services to: determine +the MIME type of an arbitrary piece of data; encapsulate access to it; +discover the operations available on it; and instantiate the appropriate bean to perform the operation(s). %package javadoc -Summary: Javadoc for %{name} +Summary: API documentation for %{name} %description javadoc -This package contains javadoc for %{name}. +API documentation for %{name}. %prep -%setup -q -n jaf-%{version} +%autosetup -p1 -n jaf-api-%{version} +pushd api %pom_remove_parent -%pom_disable_module demo - -%pom_remove_plugin :directory-maven-plugin -sed -i 's/${main.basedir}/${basedir}/' pom.xml # remove custom doclet configuration -%pom_remove_plugin :maven-javadoc-plugin activation +%pom_remove_plugin :maven-javadoc-plugin -# set bundle version manually instead of with osgiversion-maven-plugin -# (the plugin is only used to strip off -SNAPSHOT or -Mx qualifiers) -%pom_remove_plugin :osgiversion-maven-plugin -sed -i "s/\${activation.osgiversion}/%{version}/g" activation/pom.xml +%pom_remove_plugin -r :buildnumber-maven-plugin +%pom_remove_plugin -r :maven-enforcer-plugin +popd %build -# javadoc temporairly disabled due to https://github.com/fedora-java/xmvn/issues/58 -%mvn_build -j +pushd api +%mvn_build +popd %install +pushd api %mvn_install +popd -%files -f .mfiles +%files -f api/.mfiles %doc README.md %license LICENSE.md NOTICE.md -# javadoc temporairly disabled due to https://github.com/fedora-java/xmvn/issues/58 -#%files javadoc -f .mfiles-javadoc -%files javadoc +%files javadoc -f api/.mfiles-javadoc %license LICENSE.md NOTICE.md %changelog -* Sat Nov 23 2024 Marián Konček - 1.2.2-8 -- Add noarch to ExclusiveArch +* Fri Nov 29 2024 Mikolaj Izdebski - 2.1.3-9 +- Update javapackages test plan to f42 -* Fri Nov 22 2024 Marián Konček - 1.2.2-7 -- Disable building on i686 +* Wed Aug 21 2024 Mikolaj Izdebski - 2.1.3-3 +- Switch to new GitHub repository -* Tue Nov 19 2024 Marián Konček - 1.2.2-6 -- Rebuild with regenerated Requires on Java +* Thu Jul 18 2024 Fedora Release Engineering - 2.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild -* Mon Aug 09 2021 Mohan Boddu - 1.2.2-5 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Wed Mar 06 2024 Marian Koncek - 2.1.3-1 +- Update to upstream version 2.1.3 -* Mon Jun 28 2021 Mikolaj Izdebski - 1.2.2-4 +* Tue Feb 27 2024 Jiri Vanek - 2.1.2-6 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 2.1.2-5 +- bump of release for for java-21-openjdk as system jdk + +* Wed Jan 24 2024 Fedora Release Engineering - 2.1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 2.1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 2.1.2-2 +- Convert License tag to SPDX format + +* Fri Aug 18 2023 Mikolaj Izdebski - 2.1.2-1 +- Update to upstream version 2.1.2 + +* Thu Jul 20 2023 Fedora Release Engineering - 2.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Feb 08 2023 Marian Koncek - 2.1.1-3 +- Change license, reduce dependencies + +* Thu Jan 19 2023 Fedora Release Engineering - 2.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Dec 22 2022 Marian Koncek - 2.1.1-1 +- Update to upstream version 2.1.1 + +* Thu Jul 21 2022 Fedora Release Engineering - 1.2.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 1.2.2-6 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 1.2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 1.2.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jun 28 2021 Mikolaj Izdebski - 1.2.2-3 - Temporarily disable javadoc generation -- Resolves: rhbz#1976997 - -* Fri Apr 16 2021 Mohan Boddu - 1.2.2-3 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 * Tue Jan 26 2021 Fedora Release Engineering - 1.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild @@ -97,4 +137,3 @@ sed -i "s/\${activation.osgiversion}/%{version}/g" activation/pom.xml * Wed May 20 2020 Fabio Valentini - 1.2.1-5 - Package unretired and renamed from jaf. -