diff --git a/java-openjdk17.spec b/java-openjdk17.spec index 4144bcc..ebe250f 100644 --- a/java-openjdk17.spec +++ b/java-openjdk17.spec @@ -6,7 +6,7 @@ %define altverjdk %(expr 61 + %javaver) # bootstrap with external binary java environment -%define bootstrap 1 +#% define bootstrap 1 %define archbuild %{_target_cpu} @@ -45,7 +45,7 @@ %define bootopt --with-boot-jdk=$HOME/zulu17.46.19-ca-jdk17.0.9-linux_x64 %endif %ifarch %{ix86} -%define bootopt --with-boot-jdk=$HOME/zulu11.43.55-ca-jdk11.0.9.1-linux_i686 +%define bootopt --with-boot-jdk=$HOME/zulu17.48.15-ca-jdk17.0.10-linux_i686 %endif %ifarch arm %define bootopt --with-boot-jdk=$HOME/zulu11.43.100-ca-jdk11.0.9.1-linux_aarch32sf @@ -58,7 +58,7 @@ %define _jvmdir /usr/lib/jvm Name: java-openjdk17 -Version: 17.0.10_2 +Version: 17.0.11_4 Release: 1mamba Summary: OpenJDK Java %{javaver} environment Group: System/Libraries/Java @@ -89,17 +89,13 @@ BuildRequires: libpng-devel BuildRequires: libstdc++6-devel BuildRequires: libz-devel ## AUTOBUILDREQ-END -#BuildRequires: apache-ant -#BuildRequires: apache-ant-nodeps BuildRequires: binutils BuildRequires: bison BuildRequires: ca-certificates BuildRequires: coreutils BuildRequires: debianutils -#BuildRequires: desktop-file-utils BuildRequires: flex BuildRequires: gawk -#BuildRequires: gdb BuildRequires: ksh BuildRequires: mercurial BuildRequires: pkgconfig @@ -112,20 +108,14 @@ BuildRequires: xorg-proto-devel BuildRequires: zip BuildRequires: ca-certificates BuildRequires: jpackage-utils -#BuildRequires: tzdata-java BuildRequires: libnss-devel BuildRequires: llvm-devel -#BuildRequires: lsb-core %if "%{?bootstrap}" != "1" BuildRequires: java-environment >= 10 %endif %if "%{stage1}" == "1" BuildRequires: eclipse-ecj %endif -#BuildRequires: java-rhino -#BuildRequires: xalan-j2 -#BuildRequires: xerces-j2 -#BuildRequires: xml-commons-apis %ifarch arm BuildRequires: libatomic-devel %endif @@ -151,9 +141,6 @@ Provides: %{_bindir}/rmic Provides: %{_bindir}/serialver Provides: java-environment = %{javaver} Provides: java-environment-openjdk = %{javaver} -#Provides: java-openjdk = %{javaver} -#Provides: java-openjdk -#Obsoletes: java-openjdk Provides: sun-java %description @@ -185,16 +172,10 @@ Requires: sazanami-fonts Requires: cjkuni-ukai-ttf-fonts Requires: cjkuni-uming-ttf-fonts Requires: jpackage-utils -#Requires: java-rhino Requires: menu-java -#Requires: openssl -#Requires: tzdata-java Provides: java-runtime = %{javaver} Provides: java-runtime-openjdk = %{javaver} Requires: %{name}-headless = %{?epoch:%epoch:}%{version}-%{release} -#Provides: java-openjdk-runtime = %{javaver} -#Provides: java-openjdk-runtime -#Obsoletes: java-openjdk-runtime %description runtime OpenJDK Java %{javaver} runtime environment @@ -233,12 +214,9 @@ OpenJDK Java %{javaver} API documentation. #-D -T %build -#:<< ___EOF -#if [[ ${CARCH} = i686 ]]; then -# echo "Removing '-fno-plt' from CFLAGS and CXXFLAGS to prevent build fail with this architecture" -# _CFLAGS=${CFLAGS/-fno-plt/} -# _CXXFLAGS=${CXXFLAGS/-fno-plt/} -# fi +# Prevent use of ccache because is not supported +export PATH=%{_bindir}:$PATH +export JAVA_HOME=%{_jvmdir}/java-17 bash configure \ %{?bootopt} \ @@ -255,15 +233,14 @@ bash configure \ --with-lcms=system \ --with-zlib=system \ --with-harfbuzz=system \ +%ifnarch %{ix86} --with-jvm-features=zgc \ +%endif --enable-unlimited-crypto \ --disable-warnings-as-errors make images legacy-jre-image docs - -#find %{buildoutputdir} -iname '*.so' -exec chmod +x {} \; - %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -515,6 +492,9 @@ fi #%doc README %changelog +* Sat Feb 24 2024 Silvan Calarco 17.0.11_4-1mamba +- update to 17.0.11_4 + * Thu Nov 09 2023 Silvan Calarco 17.0.10_2-1mamba - update to 17.0.10_2