Drop generated Requires on various Java versions

Related: RHEL-62409
This commit is contained in:
Marián Konček 2024-11-04 09:13:40 +01:00
parent c5004c4682
commit ca4ffa814e
3 changed files with 9 additions and 7 deletions

View File

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

View File

@ -14,7 +14,7 @@
Name: javapackages-tools Name: javapackages-tools
Version: 6.0.0 Version: 6.0.0
Release: 5%{?dist} Release: 6%{?dist}
Summary: Macros and scripts for Java packaging support Summary: Macros and scripts for Java packaging support
License: BSD License: BSD
URL: https://github.com/fedora-java/javapackages URL: https://github.com/fedora-java/javapackages
@ -220,6 +220,10 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
%license LICENSE %license LICENSE
%changelog %changelog
* Mon Nov 04 2024 Marián Konček <mkoncek@redhat.com> - 6.0.0-6
- Drop generated Requires on various Java versions
- Related: RHEL-62409
* Mon Oct 21 2024 Marián Konček <mkoncek@redhat.com> - 6.0.0-5 * Mon Oct 21 2024 Marián Konček <mkoncek@redhat.com> - 6.0.0-5
- Include java-21-headless in generated auto-requires - Include java-21-headless in generated auto-requires
- Related: RHEL-62409 - Related: RHEL-62409

View File

@ -1,10 +1,9 @@
summary: Basic smoke tests summary: Basic smoke tests
discover: discover:
how: fmf how: fmf
# FIXME url: https://src.fedoraproject.org/tests/javapackages-tools
#url: https://src.fedoraproject.org/tests/javapackages-tools environment:
url: https://src.fedoraproject.org/forks/mkoncek/tests/javapackages-tools DEFAULT_OPENJDK_VERSION: "17"
ref: c9s
prepare: prepare:
how: install how: install
exclude: exclude: