rpms/javapackages-tools
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Add OpenJDK 8 toolchain configuration

Browse Source
This commit is contained in:
Mikolaj Izdebski 2020-01-23 13:26:15 +01:00
parent 0429311d9e
commit e13aca838f
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
javapackages-tools.spec
View File

@ -24,7 +24,7 @@
Name: javapackages-tools Name: javapackages-tools
Version: 5.3.1 Version: 5.3.1
Release: 6%{?dist} Release: 7%{?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
@ -32,6 +32,7 @@ BuildArch: noarch
Source0: https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz Source0: https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz
Source1: module-config.xml Source1: module-config.xml
Source2: toolchains-openjdk8.xml
Patch1: 0001-Move-python-modules-under-java-utils-directory.patch Patch1: 0001-Move-python-modules-under-java-utils-directory.patch
Patch2: 0002-Enable-namespaced-dependency-generation.patch Patch2: 0002-Enable-namespaced-dependency-generation.patch
@ -126,6 +127,14 @@ Summary: Configuration files for building maven-3.6 module
%description -n javapackages-config-maven-3.6 %description -n javapackages-config-maven-3.6
This package provides configuration files for building maven-3.6 module. This package provides configuration files for building maven-3.6 module.
%package -n maven-local-openjdk8
Summary: OpenJDK 8 toolchain for XMvn
Requires: maven-local
Requires: java-1.8.0-openjdk-devel
%description -n maven-local-openjdk8
OpenJDK 8 toolchain for XMvn
%prep %prep
%setup -q -n javapackages-%{version} %setup -q -n javapackages-%{version}
%patch1 -p1 %patch1 -p1
@ -162,6 +171,9 @@ rm -rf %{buildroot}%{_bindir}/gradle-local
rm -rf %{buildroot}%{_datadir}/gradle-local rm -rf %{buildroot}%{_datadir}/gradle-local
rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7
mkdir -p %{buildroot}%{_datadir}/xmvn/conf/
cp -p %{SOURCE2} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml
%check %check
./check ./check
@ -180,7 +192,13 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7
%files -n javapackages-config-maven-3.6 %files -n javapackages-config-maven-3.6
%{_datadir}/xmvn/config.d %{_datadir}/xmvn/config.d
%files -n maven-local-openjdk8
%{_datadir}/xmvn/conf
%changelog %changelog
* Thu Jan 23 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-7
- Add OpenJDK 8 toolchain configuration
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-6 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-6
- Mass rebuild for javapackages-tools 201902 - Mass rebuild for javapackages-tools 201902

11
toolchains-openjdk8.xml Normal file
View File

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