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

Revert "Switch back to OpenJDK 1.8.0"

Browse Source 
This reverts commit 697ad8d615.
This commit is contained in:
Mikolaj Izdebski 2020-01-23 09:42:29 +01:00
parent 697ad8d615
commit 0429311d9e
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
javapackages-tools.spec
View File

@ -19,12 +19,12 @@
%global __os_install_post %(echo '%{__os_install_post}' | sed -e /python-bytecompile/d) %global __os_install_post %(echo '%{__os_install_post}' | sed -e /python-bytecompile/d)
%endif %endif
%global default_jdk %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/java-1.8.0-openjdk %global default_jdk %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/java-11-openjdk
%global default_jre %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/jre-1.8.0-openjdk %global default_jre %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/jre-11-openjdk
Name: javapackages-tools Name: javapackages-tools
Version: 5.3.1 Version: 5.3.1
Release: 7%{?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
@ -51,13 +51,15 @@ Requires: coreutils
Requires: findutils Requires: findutils
Requires: which Requires: which
# default JRE # default JRE
Requires: java-1.8.0-openjdk-headless Requires: java-11-openjdk-headless
Provides: jpackage-utils = %{version}-%{release} Provides: jpackage-utils = %{version}-%{release}
# These could be generated automatically, but then we would need to # These could be generated automatically, but then we would need to
# depend on javapackages-local for dependency generator. # depend on javapackages-local for dependency generator.
Provides: mvn(com.sun:tools) = SYSTEM Provides: mvn(com.sun:tools) = SYSTEM
Provides: mvn(sun.jdk:jconsole) = SYSTEM Provides: mvn(sun.jdk:jconsole) = SYSTEM
# XXX temp provide
Provides: java-headless = 1:11
%description %description
This package provides macros and scripts to support Java packaging. This package provides macros and scripts to support Java packaging.
@ -106,12 +108,14 @@ Requires: xmvn-install
Requires: xmvn-subst Requires: xmvn-subst
Requires: xmvn-resolve Requires: xmvn-resolve
# Java build systems don't have hard requirement on java-devel, so it should be there # Java build systems don't have hard requirement on java-devel, so it should be there
Requires: java-1.8.0-openjdk-devel Requires: java-11-openjdk-devel
Requires: %{python_interpreter} Requires: %{python_interpreter}
Requires: %{python_prefix}-lxml Requires: %{python_prefix}-lxml
Requires: %{python_prefix}-six Requires: %{python_prefix}-six
Obsoletes: %{python_prefix}-javapackages < %{version}-%{release} Obsoletes: %{python_prefix}-javapackages < %{version}-%{release}
Obsoletes: python-javapackages < %{version}-%{release} Obsoletes: python-javapackages < %{version}-%{release}
# XXX temp provide
Provides: java-devel = 1:11
%description -n javapackages-local %description -n javapackages-local
This package provides non-essential macros and scripts to support Java packaging. This package provides non-essential macros and scripts to support Java packaging.
@ -177,9 +181,6 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7
%{_datadir}/xmvn/config.d %{_datadir}/xmvn/config.d
%changelog %changelog
* Wed Jan 22 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-7
- Switch back to OpenJDK 1.8.0
* 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