Compare commits

..

No commits in common. "changed/a8-stream-201902/javapackages-tools-5.3.1-7.module+el8.2.0+5555+73059ce4.alma" and "c8-stream-201902" have entirely different histories.

2 changed files with 1 additions and 28 deletions

View File

@ -1,20 +0,0 @@
{
"maven.req": {
"always_generate": [
"javapackages-filesystem",
"(java-headless or java-17-headless or java-11-headless or java-1.8.0-headless)"
],
"java_requires": {
"skip": true
},
"java_devel_requires": {
"skip": true
}
},
"javadoc.req": {
"always_generate": [
"javapackages-filesystem"
]
}
}

View File

@ -24,7 +24,7 @@
Name: javapackages-tools
Version: 5.3.1
Release: 7%{?dist}.alma
Release: 7%{?dist}
Summary: Macros and scripts for Java packaging support
License: BSD
URL: https://github.com/fedora-java/javapackages
@ -33,7 +33,6 @@ BuildArch: noarch
Source0: https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz
Source1: module-config.xml
Source2: toolchains-openjdk8.xml
Source3: javapackages-config.json
Patch1: 0001-Move-python-modules-under-java-utils-directory.patch
Patch2: 0002-Enable-namespaced-dependency-generation.patch
@ -175,8 +174,6 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7
mkdir -p %{buildroot}%{_datadir}/xmvn/conf/
cp -p %{SOURCE2} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml
install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config.json
%check
./check
@ -199,10 +196,6 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
%{_datadir}/xmvn/conf
%changelog
* Mon Apr 10 2023 Andrew Lukoshko <alukoshko@almalinux.org> - 5.3.1-7.alma
- Add generated Requires on multiple versions of java-headless
- Related: rhbz#2164437
* Thu Jan 23 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-7
- Add OpenJDK 8 toolchain configuration