up to 11.0.12

[packages/openjdk11.git] / openjdk11.spec

diff --git a/openjdk11.spec b/openjdk11.spec
index 4b8a020bbcfe389a5d3e118e9c8296b246c99eeb..84a90d2daf3943842a08e39634f81a08f95e1309 100644 (file)
--- a/openjdk11.spec
+++ b/openjdk11.spec
@@ -15,18 +15,22 @@
 %define                with_zero       1
 %endif
 
+%ifarch %{ix86} %{x8664} aarch64
+%define                with_shenandoahgc       1
+%endif
+
 # class data version seen with file(1) that this jvm is able to load
 %define                _classdataversion 55.0
 
 Summary:       Open-source implementation of the Java Platform, Standard Edition
 Summary(pl.UTF-8):     Wolnoźródłowa implementacja Java 11 SE
 Name:          openjdk11
-Version:       11.0.10
+Version:       11.0.12
 Release:       1
 License:       GPL v2
 Group:         Development/Languages/Java
 Source0:       https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-%{version}-ga.tar.bz2?/%{name}-%{version}.tar.bz2
-# Source0-md5: f774f1513d25eaa6baa8edc584f96b36
+# Source0-md5: aa4b4199677892fd91de9316398dee6d
 Source10:      make-cacerts.sh
 Patch0:                libpath.patch
 Patch1:                x32.patch
@@ -185,19 +189,19 @@ Provides: java1.4
 Provides:      jre = %{version}
 Obsoletes:     icedtea6-jre
 Obsoletes:     icedtea7-jre
-Obsoletes:     java(jaas)
-Obsoletes:     java(jaf)
-Obsoletes:     java(jaxp)
-Obsoletes:     java(jce)
-Obsoletes:     java(jdbc-stdext)
-Obsoletes:     java(jdbc-stdext)
-Obsoletes:     java(jmx)
-Obsoletes:     java(jndi)
-Obsoletes:     java(jsse)
+Obsoletes:     jaas
+Obsoletes:     jaf
 Obsoletes:     java-gcj-compat
+Obsoletes:     java-jaxp
+Obsoletes:     java-jdbc-stdext
 Obsoletes:     java-sun-jre
 Obsoletes:     java5-sun-jre
+Obsoletes:     jce
+Obsoletes:     jdbc-stdext
+Obsoletes:     jmx
+Obsoletes:     jndi
 Obsoletes:     jre
+Obsoletes:     jsse
 Obsoletes:     oracle-java7-jre
 
 %description jre
@@ -270,6 +274,18 @@ GTK support for OpenJDK runtime environment.
 %description jre-base-gtk -l pl.UTF-8
 Biblioteki GTK dla OpenJDK.
 
+%package jmods
+Summary:       OpenJDK - JMods
+Summary(pl.UTF-8):     OpenJDK - JMods
+Group:         Development/Languages/Java
+Requires:      %{name}-jdk-base = %{version}-%{release}
+
+%description jmods
+JMods for OpenJDK.
+
+%description jmods -l pl.UTF-8
+JMods dla OpenJDK.
+
 %package jar
 Summary:       OpenJDK - JAR tool
 Summary(pl.UTF-8):     OpenJDK - narzędzie JAR
@@ -298,7 +314,7 @@ archiwów.
 Summary:       OpenJDK - sources
 Summary(pl.UTF-8):     OpenJDK - kod źródłowy
 Group:         Documentation
-%{?noarchpackage}
+BuildArch:     noarch
 
 %description jdk-sources
 Source code for the OpenJDK development kit and Java standard library.
@@ -311,7 +327,7 @@ biblioteki Javy.
 Summary:       OpenJDK - examples
 Summary(pl.UTF-8):     OpenJDK - przykłady
 Group:         Documentation
-%{?noarchpackage}
+BuildArch:     noarch
 
 %description examples
 Code examples for OpenJDK.
@@ -352,6 +368,7 @@ chmod a+x configure
        --with-extra-cflags="%{rpmcppflags} %{rpmcflags} -fcommon -fno-tree-dse" \
        --with-extra-cxxflags="%{rpmcppflags} %{rpmcxxflags} -fcommon -fno-tree-dse" \
        --with-extra-ldflags="%{rpmldflags}" \
+       --with-jvm-features="%{?with_shenandoahgc:shenandoahgc}" \
        --with-native-debug-symbols=none \
        --disable-full-docs \
        --disable-javac-server \
@@ -532,7 +549,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dstdir}/bin/rmic
 %attr(755,root,root) %{dstdir}/bin/serialver
 %{dstdir}/include
-%{dstdir}/jmods
 %{dstdir}/lib/ct.sym
 
 %files jre
@@ -644,6 +660,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{dstdir}/lib/libfontmanager.so
 
+%files jmods
+%defattr(644,root,root,755)
+%{dstdir}/jmods
+
 %files jar
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/jar