import CS javapackages-tools-6.1.0-6.module_el8+931+be23202a

This commit is contained in:
eabdullin 2024-04-04 19:51:04 +00:00
parent c35b05a132
commit fe922ecd6a
4 changed files with 37 additions and 3 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
SOURCES/6.1.0.tar.gz

View File

@ -2,7 +2,7 @@
"maven.req": {
"always_generate": [
"javapackages-filesystem",
"(java-headless or java-17-headless)"
"(java-headless or java-21-headless or java-17-headless or java-11-headless or java-1.8.0-headless)"
],
"java_requires": {
"skip": true

View File

@ -0,0 +1,11 @@
<toolchains>
<toolchain>
<type>jdk</type>
<provides>
<xmvn>xmvn</xmvn>
</provides>
<configuration>
<jdkHome>/usr/lib/jvm/java-21-openjdk</jdkHome>
</configuration>
</toolchain>
</toolchains>

View File

@ -10,11 +10,11 @@
%global default_jdk %{_prefix}/lib/jvm/java-17-openjdk
%global default_jre %{_prefix}/lib/jvm/jre-17-openjdk
%global maven_home %{_datadir}/xmvn
%global maven_home %{_usr}/share/xmvn
Name: javapackages-tools
Version: 6.1.0
Release: 4%{?dist}
Release: 6%{?dist}
Summary: Macros and scripts for Java packaging support
License: BSD
URL: https://github.com/fedora-java/javapackages
@ -26,6 +26,7 @@ Source3: javapackages-config.json
Source8: toolchains-openjdk8.xml
Source11: toolchains-openjdk11.xml
Source17: toolchains-openjdk17.xml
Source21: toolchains-openjdk21.xml
BuildRequires: coreutils
BuildRequires: which
@ -158,6 +159,15 @@ Requires: java-17-openjdk-devel
%description -n maven-local-openjdk17
OpenJDK 17 toolchain for XMvn
%package -n maven-local-openjdk21
Summary: OpenJDK 21 toolchain for XMvn
RemovePathPostfixes: -openjdk21
Requires: maven-local
Requires: java-21-openjdk-devel
%description -n maven-local-openjdk21
OpenJDK 21 toolchain for XMvn
%prep
%setup -q -n javapackages-%{version}
@ -186,6 +196,7 @@ mkdir -p %{buildroot}%{maven_home}/conf/
cp -p %{SOURCE8} %{buildroot}%{maven_home}/conf/toolchains.xml-openjdk8
cp -p %{SOURCE11} %{buildroot}%{maven_home}/conf/toolchains.xml-openjdk11
cp -p %{SOURCE17} %{buildroot}%{maven_home}/conf/toolchains.xml-openjdk17
cp -p %{SOURCE21} %{buildroot}%{maven_home}/conf/toolchains.xml-openjdk21
install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config.json
@ -222,10 +233,21 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
%dir %{maven_home}/conf
%{maven_home}/conf/toolchains.xml-openjdk17
%files -n maven-local-openjdk21
%dir %{maven_home}/conf
%{maven_home}/conf/toolchains.xml-openjdk21
%files -n %{python_prefix}-javapackages -f files-python
%license LICENSE
%changelog
* Thu Feb 01 2024 Marián Konček <mkoncek@redhat.com> - 6.1.0-6
- Add generated Requires on Java 21
- Related: RHEL-17126
* Thu Jan 26 2023 Marian Koncek <mkoncek@redhat.com> - 6.1.0-5
- Add generated Requires on multiple versions of java-headless
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild