Update to upstream version 2.1.1

This commit is contained in:
Marian Koncek 2022-11-24 12:32:38 +01:00
parent c14daca28e
commit a1470a6cfa
3 changed files with 21 additions and 17 deletions

2
.gitignore vendored
View File

@ -3,3 +3,5 @@
/jaf-1.2.1.tar.gz
/jaf-1.2.2.tar.gz
/jaf-2.1.0.tar.gz
/jaf-2.1.1.tar.gz

View File

@ -1,9 +1,10 @@
Name: jakarta-activation
Version: 1.2.2
Release: 7%{?dist}
Summary: Jakarta Activation Specification and Implementation
Version: 2.1.1
Release: 1%{?dist}
Summary: Jakarta Activation API
# spec is licensed under (EPL-2.0 and GPLv2 with exceptions) but is not shipped
License: BSD
URL: https://eclipse-ee4j.github.io/jaf/
URL: https://jakartaee.github.io/jaf-api/
BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
@ -29,30 +30,29 @@ Summary: Javadoc for %{name}
This package contains javadoc for %{name}.
%prep
%setup -q -n jaf-%{version}
%setup -q -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 :buildnumber-maven-plugin
popd
%build
pushd api
# javadoc temporairly disabled due to https://github.com/fedora-java/xmvn/issues/58
%mvn_build -j
popd
%install
pushd api
%mvn_install
popd
%files -f .mfiles
%files -f api/.mfiles
%doc README.md
%license LICENSE.md NOTICE.md
@ -62,6 +62,9 @@ sed -i "s/\${activation.osgiversion}/%{version}/g" activation/pom.xml
%license LICENSE.md NOTICE.md
%changelog
* Thu Dec 22 2022 Marian Koncek <mkoncek@redhat.com> - 2.1.1-1
- Update to upstream version 2.1.1
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
@ -92,4 +95,3 @@ sed -i "s/\${activation.osgiversion}/%{version}/g" activation/pom.xml
* Wed May 20 2020 Fabio Valentini <decathorpe@gmail.com> - 1.2.1-5
- Package unretired and renamed from jaf.

View File

@ -1 +1 @@
SHA512 (jaf-1.2.2.tar.gz) = a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
SHA512 (jaf-2.1.1.tar.gz) = 23bb5fa6e1b6ee40686e6ea85a4d0a380a2f2ecf3132274b2ad827da3e5466e279f85c5953d97555cf7f75f03623a967c9a45b23e60230bec85a8a856f21a427