diff --git a/icedtea.spec b/icedtea.spec index 677c068..b9eae42 100644 --- a/icedtea.spec +++ b/icedtea.spec @@ -6,7 +6,7 @@ %define mauve_date 2008-10-22 # java-access-bridge latest release 1.26.2 do not upgrade for now -%define gnome_jab_url http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/ +%define gnome_jab_url https://download.gnome.org/sources/java-access-bridge/ %define gnome_jab_version 1.23.0 %define gnome_jab_majorver %(echo %gnome_jab_version | cut -d. -f 1-2) @@ -70,14 +70,14 @@ #%endif Name: icedtea -Version: 8u222b10_3.13.0 +Version: 8u292b10_3.19.0 Release: 1mamba Summary: The IcedTea project provides a harness to build the openjdk Group: System/Libraries/Java Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: http://icedtea.classpath.org/ +URL: https://openjdk.java.net/projects/icedtea/ Source0: http://icedtea.classpath.org/download/source/icedtea-%{icedtea_version}.tar.xz Source1: %{drops_url}/icedtea%{javaver}-openjdk-%{icedtea_version}.tar.xz Source3: icedtea-autoupdate @@ -94,25 +94,19 @@ License: GPL (with exceptions) ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel BuildRequires: libX11-devel +BuildRequires: libXcomposite-devel BuildRequires: libXext-devel BuildRequires: libXi-devel BuildRequires: libXrender-devel BuildRequires: libXtst-devel BuildRequires: libalsa-devel -BuildRequires: libatk-devel -BuildRequires: libcairo-devel -BuildRequires: libcups-devel -BuildRequires: libfontconfig-devel +BuildRequires: libe2fs-devel BuildRequires: libfreetype-devel BuildRequires: libgcc -BuildRequires: libgdk-pixbuf-devel BuildRequires: libgif-devel -BuildRequires: libglib-devel -BuildRequires: libgtk2-devel BuildRequires: libjpeg-devel BuildRequires: libkrb5-devel BuildRequires: liblcms2-devel -BuildRequires: libpango-devel BuildRequires: libpcsclite-devel BuildRequires: libpng-devel BuildRequires: libsctp-devel @@ -175,17 +169,16 @@ BuildRequires: java-gcj-compat %if "%{stage1}" == "1" BuildRequires: eclipse-ecj %endif -BuildRequires: java-rhino -BuildRequires: xalan-j2 -BuildRequires: xerces-j2 -BuildRequires: xml-commons-apis +#BuildRequires: java-rhino +#BuildRequires: xalan-j2 +#BuildRequires: xerces-j2 +#BuildRequires: xml-commons-apis %if %enabled_systemtap BuildRequires: systemtap-sdt-devel %endif %ifarch arm BuildRequires: libatomic-devel %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-root %description The IcedTea project provides a harness to build the source code from http://openjdk.java.net using Free Software build tools and adds a number of key features to the upstream OpenJDK codebase. @@ -227,7 +220,7 @@ Provides: %{_bindir}/wsimport Provides: %{_bindir}/xjc Provides: java-openjdk = %{javaver} Provides: java-openjdk -Obsoletes: java-openjdk +Obsoletes: java-openjdk <= 8u222b10_3.13.0 Provides: sun-java %description -n java-openjdk%{javaver} @@ -244,7 +237,7 @@ Requires: sazanami-fonts Requires: cjkuni-ukai-ttf-fonts Requires: cjkuni-uming-ttf-fonts Requires: jpackage-utils -Requires: java-rhino +#Requires: java-rhino Requires: menu-java Requires: openssl Requires: tzdata-java @@ -260,7 +253,7 @@ Provides: %{_bindir}/tnameserv Provides: %{_bindir}/unpack200 Provides: java-openjdk-runtime = %{javaver} Provides: java-openjdk-runtime -Obsoletes: java-openjdk-runtime +Obsoletes: java-openjdk-runtime <= 8u222b10_3.13.0 Provides: sun-java-runtime %description -n java-openjdk%{javaver}-runtime @@ -272,7 +265,7 @@ Group: Development/Languages Requires: java-openjdk%{javaver} = %{?epoch:%epoch:}%{version}-%{release} Provides: java-demo = %{javaver} Provides: java-openjdk-demo -Obsoletes: java-openjdk-demo +Obsoletes: java-openjdk-demo <= 8u222b10_3.13.0 %description -n java-openjdk%{javaver}-demo The OpenJDK demos. @@ -283,7 +276,7 @@ Group: Development/Languages Requires: java-openjdk%{javaver} = %{?epoch:%epoch:}%{version}-%{release} Provides: java-src = %{javaver} Provides: java-openjdk-src -Obsoletes: java-openjdk-src +Obsoletes: java-openjdk-src <= 8u222b10_3.13.0 %description -n java-openjdk%{javaver}-src The OpenJDK source bundle @@ -295,7 +288,7 @@ Requires: java-openjdk%{javaver} = %{?epoch:%epoch:}%{version}-%{release} Provides: sun-java-javadoc = %{javaver} Provides: java-javadoc = %{javaver} Provides: java-openjdk-javadoc -Obsoletes: java-openjdk-javadoc +Obsoletes: java-openjdk-javadoc <= 8u222b10_3.13.0 %description -n java-openjdk%{javaver}-javadoc The OpenJDK API documentation. @@ -312,9 +305,9 @@ sed "s|-Xshare:dump|-Xshare:dump -Xmx512m|" Makefile.in %build #:<< _EOF unset JAVA_HOME -%ifarch arm -export JAVA_HOME=/usr/lib/jvm/java-1.7.0-sun/ -%endif +#%ifarch arm +#export JAVA_HOME=/usr/lib/jvm/java-1.7.0-sun/ +#%endif export CCACHE= @@ -326,6 +319,9 @@ export CCACHE= --with-openjdk-src-zip=%{SOURCE1} \ %ifarch arm --with-hotspot-src-zip=%{SOURCE14} \ + --build=armv5-openmamba-linux-gnueabi \ + --target=armv5-openmamba-linux-gnueabi \ + CFLAGS="-O0" CXXFLAGS="-O0" \ %else --with-hotspot-src-zip=%{SOURCE7} \ %endif @@ -339,9 +335,9 @@ export CCACHE= --enable-nss \ --disable-ccache \ %ifarch arm - --with-jdk-home=%{_jvmdir}/java-1.7.0-sun \ + --with-jdk-home=/var/autodist/zulu8.62.0.19-ca-jdk8.0.332-linux_aarch32sf \ %else - --with-jdk-home=%{_jvmdir}/java-1.8.0-sun \ + --with-jdk-home=%{_jvmdir}/java-8-openjdk \ %endif %if "%{bootstrap}" != "1" --with-ecj-jar=$(build-classpath eclipse-ecj) \ @@ -373,18 +369,9 @@ export CCACHE= make MEMORY_LIMIT=-J-Xmx512m patch %ifarch arm -LD_PRELOAD=%{_libdir}/libatomic.so make MEMORY_LIMIT=-J-Xmx512m DISABLE_HOTSPOT_OS_VERSION_CHECK=ok + LD_PRELOAD=%{_libdir}/libatomic.so make MEMORY_LIMIT=-J-Xmx512m DISABLE_HOTSPOT_OS_VERSION_CHECK=ok %else -count=0 -set +e -while [[ count -lt 50 ]]; do -# Workaround for java random crashes on build servers -count=$((count+1)) make MEMORY_LIMIT=-J-Xmx512m DISABLE_HOTSPOT_OS_VERSION_CHECK=ok -[ $? -eq 0 ] && break -done -[ $? -ne 0 ] && exit 1 -set -e %endif :<< ___EOF @@ -547,11 +534,11 @@ if [ $1 -ge 1 ]; then /usr/sbin/update-alternatives --install %{javaprefix}/java-%{origin} jdk_%{origin} %{_jvmdir}/%{sdklnk} 70 /usr/sbin/update-alternatives --install %{javaprefix}/java jdk_java %{_jvmdir}/%{sdklnk} 70 - /usr/sbin/update-alternatives --install %{_jvmjardir}/jdk jdk_exports %{_jvmjardir}/%{sdklnk} 70 - /usr/sbin/update-alternatives --install %{_jvmjardir}/java-%{javaver}-%{origin} jdk_%{javaver}_%{origin}_exports %{_jvmjardir}/%{sdklnk} 70 - /usr/sbin/update-alternatives --install %{_jvmjardir}/java jdk_java_exports %{_jvmjardir}/%{sdklnk} 70 - /usr/sbin/update-alternatives --install %{_jvmjardir}/java-%{origin} jdk_%{origin}_exports %{_jvmjardir}/%{sdklnk} 70 - /usr/sbin/update-alternatives --install %{_jvmjardir}/java-%{javaver} jdk_%{javaver}_exports %{_jvmjardir}/%{sdklnk} 70 +# /usr/sbin/update-alternatives --install %{_jvmjardir}/jdk jdk_exports %{_jvmjardir}/%{sdklnk} 70 +# /usr/sbin/update-alternatives --install %{_jvmjardir}/java-%{javaver}-%{origin} jdk_%{javaver}_%{origin}_exports %{_jvmjardir}/%{sdklnk} 70 +# /usr/sbin/update-alternatives --install %{_jvmjardir}/java jdk_java_exports %{_jvmjardir}/%{sdklnk} 70 +# /usr/sbin/update-alternatives --install %{_jvmjardir}/java-%{origin} jdk_%{origin}_exports %{_jvmjardir}/%{sdklnk} 70 +# /usr/sbin/update-alternatives --install %{_jvmjardir}/java-%{javaver} jdk_%{javaver}_exports %{_jvmjardir}/%{sdklnk} 70 fi update-desktop-database %{_datadir}/applications &> /dev/null || : @@ -576,11 +563,11 @@ if [ $1 -eq 0 ]; then /usr/sbin/update-alternatives --remove jdk_%{origin} %{_jvmdir}/%{sdklnk} /usr/sbin/update-alternatives --remove jdk_%{javaver} %{_jvmdir}/%{sdklnk} - /usr/sbin/update-alternatives --remove jdk_exports %{_jvmjardir}/%{sdklnk} - /usr/sbin/update-alternatives --remove jdk_%{javaver}_%{origin}_exports %{_jvmjardir}/%{sdklnk} - /usr/sbin/update-alternatives --remove jdk_java_exports %{_jvmjardir}/%{sdklnk} - /usr/sbin/update-alternatives --remove jdk_%{origin}_exports %{_jvmjardir}/%{sdklnk} - /usr/sbin/update-alternatives --remove jdk_%{javaver}_exports %{_jvmjardir}/%{sdklnk} +# /usr/sbin/update-alternatives --remove jdk_exports %{_jvmjardir}/%{sdklnk} +# /usr/sbin/update-alternatives --remove jdk_%{javaver}_%{origin}_exports %{_jvmjardir}/%{sdklnk} +# /usr/sbin/update-alternatives --remove jdk_java_exports %{_jvmjardir}/%{sdklnk} +# /usr/sbin/update-alternatives --remove jdk_%{origin}_exports %{_jvmjardir}/%{sdklnk} +# /usr/sbin/update-alternatives --remove jdk_%{javaver}_exports %{_jvmjardir}/%{sdklnk} fi exit 0 @@ -598,11 +585,11 @@ if [ $1 -eq 0 ]; then /usr/sbin/update-alternatives --remove jdk_%{origin} %{_jvmdir}/%{sdklnk} /usr/sbin/update-alternatives --remove jdk_%{javaver} %{_jvmdir}/%{sdklnk} - /usr/sbin/update-alternatives --remove jdk_exports %{_jvmjardir}/%{sdklnk} - /usr/sbin/update-alternatives --remove jdk_%{javaver}_%{origin}_exports %{_jvmjardir}/%{sdklnk} - /usr/sbin/update-alternatives --remove jdk_java_exports %{_jvmjardir}/%{sdklnk} - /usr/sbin/update-alternatives --remove jdk_%{origin}_exports %{_jvmjardir}/%{sdklnk} - /usr/sbin/update-alternatives --remove jdk_%{javaver}_exports %{_jvmjardir}/%{sdklnk} +# /usr/sbin/update-alternatives --remove jdk_exports %{_jvmjardir}/%{sdklnk} +# /usr/sbin/update-alternatives --remove jdk_%{javaver}_%{origin}_exports %{_jvmjardir}/%{sdklnk} +# /usr/sbin/update-alternatives --remove jdk_java_exports %{_jvmjardir}/%{sdklnk} +# /usr/sbin/update-alternatives --remove jdk_%{origin}_exports %{_jvmjardir}/%{sdklnk} +# /usr/sbin/update-alternatives --remove jdk_%{javaver}_exports %{_jvmjardir}/%{sdklnk} fi @@ -620,11 +607,8 @@ fi fi for b in java keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 ; do - [ -L /usr/bin/$b -a "`readlink /usr/bin/$b`" != "/etc/alternatives/$b" ] && - rm -f /usr/bin/$b 2>/dev/null - /usr/sbin/update-alternatives \ - --install %{_bindir}/$b $b \ - %{jrebindir}/$b 70 + [ -L /usr/bin/$b -a "`readlink /usr/bin/$b`" != "/etc/alternatives/$b" ] && rm -f /usr/bin/$b 2>/dev/null + /usr/sbin/update-alternatives --install %{_bindir}/$b $b %{jrebindir}/$b 70 done /usr/sbin/update-alternatives --install %{javaprefix}/jre jre %{_jvmdir}/%{jrelnk} 70 @@ -632,10 +616,10 @@ fi /usr/sbin/update-alternatives --install %{javaprefix}/jre-%{javaver}-%{origin} jre_%{javaver}_%{origin} %{_jvmdir}/%{jrelnk} 70 /usr/sbin/update-alternatives --install %{javaprefix}/jre-%{origin} jre_%{origin} %{_jvmdir}/%{jrelnk} 70 - /usr/sbin/update-alternatives --install %{_jvmjardir}/jre jre_exports %{_jvmjardir}/%{jrelnk} 70 - /usr/sbin/update-alternatives --install %{_jvmjardir}/jre-%{origin} jre_%{origin}_exports %{_jvmjardir}/%{jrelnk} 70 - /usr/sbin/update-alternatives --install %{_jvmjardir}/jre-%{javaver}-%{origin} jre_%{javaver}_%{origin}_exports %{_jvmjardir}/%{jrelnk} 70 - /usr/sbin/update-alternatives --install %{_jvmjardir}/jre-%{javaver} jre_%{javaver}_exports %{_jvmjardir}/%{jrelnk} 70 +# /usr/sbin/update-alternatives --install %{_jvmjardir}/jre jre_exports %{_jvmjardir}/%{jrelnk} 70 +# /usr/sbin/update-alternatives --install %{_jvmjardir}/jre-%{origin} jre_%{origin}_exports %{_jvmjardir}/%{jrelnk} 70 +# /usr/sbin/update-alternatives --install %{_jvmjardir}/jre-%{javaver}-%{origin} jre_%{javaver}_%{origin}_exports %{_jvmjardir}/%{jrelnk} 70 +# /usr/sbin/update-alternatives --install %{_jvmjardir}/jre-%{javaver} jre_%{javaver}_exports %{_jvmjardir}/%{jrelnk} 70 # Update for jnlp handling. update-desktop-database %{_datadir}/applications &> /dev/null || : @@ -644,14 +628,13 @@ touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor fi -exit 0 +: %preun -n java-openjdk%{javaver}-runtime if [ $1 -eq 0 ]; then for b in java keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 ; do - [ -L /usr/bin/$b -a "`readlink /usr/bin/$b`" != "/etc/alternatives/$b" ] && - rm -f /usr/bin/$b + [ -L /usr/bin/$b -a "`readlink /usr/bin/$b`" != "/etc/alternatives/$b" ] && rm -f /usr/bin/$b /usr/sbin/update-alternatives --remove $b %{jrebindir}/$b done @@ -660,12 +643,12 @@ if [ $1 -eq 0 ]; then /usr/sbin/update-alternatives --remove jre_%{javaver}_%{origin} %{_jvmdir}/%{jrelnk} /usr/sbin/update-alternatives --remove jre_%{javaver} %{_jvmdir}/%{jrelnk} - /usr/sbin/update-alternatives --remove jre_exports %{_jvmjardir}/%{jrelnk} - /usr/sbin/update-alternatives --remove jre_%{origin}_exports %{_jvmjardir}/%{jrelnk} - /usr/sbin/update-alternatives --remove jre_%{javaver}_%{origin}_exports %{_jvmjardir}/%{jrelnk} - /usr/sbin/update-alternatives --remove jre_%{javaver}_exports %{_jvmjardir}/%{jrelnk} +# /usr/sbin/update-alternatives --remove jre_exports %{_jvmjardir}/%{jrelnk} +# /usr/sbin/update-alternatives --remove jre_%{origin}_exports %{_jvmjardir}/%{jrelnk} +# /usr/sbin/update-alternatives --remove jre_%{javaver}_%{origin}_exports %{_jvmjardir}/%{jrelnk} +# /usr/sbin/update-alternatives --remove jre_%{javaver}_exports %{_jvmjardir}/%{jrelnk} fi -exit 0 +: %postun -n java-openjdk%{javaver}-runtime if [ $1 -eq 0 ]; then @@ -680,10 +663,10 @@ if [ $1 -eq 0 ]; then /usr/sbin/update-alternatives --remove jre_%{javaver}_%{origin} %{_jvmdir}/%{jrelnk} /usr/sbin/update-alternatives --remove jre_%{javaver} %{_jvmdir}/%{jrelnk} - /usr/sbin/update-alternatives --remove jre_exports %{_jvmjardir}/%{jrelnk} - /usr/sbin/update-alternatives --remove jre_%{origin}_exports %{_jvmjardir}/%{jrelnk} - /usr/sbin/update-alternatives --remove jre_%{javaver}_%{origin}_exports %{_jvmjardir}/%{jrelnk} - /usr/sbin/update-alternatives --remove jre_%{javaver}_exports %{_jvmjardir}/%{jrelnk} +# /usr/sbin/update-alternatives --remove jre_exports %{_jvmjardir}/%{jrelnk} +# /usr/sbin/update-alternatives --remove jre_%{origin}_exports %{_jvmjardir}/%{jrelnk} +# /usr/sbin/update-alternatives --remove jre_%{javaver}_%{origin}_exports %{_jvmjardir}/%{jrelnk} +# /usr/sbin/update-alternatives --remove jre_%{javaver}_exports %{_jvmjardir}/%{jrelnk} fi # Update for jnlp handling. @@ -718,6 +701,7 @@ fi %{_jvmdir}/%{sdkdir}/bin/jdb %{_jvmdir}/%{sdkdir}/bin/jdeps %{_jvmdir}/%{sdkdir}/bin/jhat +%{_jvmdir}/%{sdkdir}/bin/jfr %{_jvmdir}/%{sdkdir}/bin/jinfo %{_jvmdir}/%{sdkdir}/bin/jjs %{_jvmdir}/%{sdkdir}/bin/jmap @@ -845,17 +829,15 @@ fi %defattr(-,root,root) %dir %{_jvmdir}/%{sdkdir} %{_jvmdir}/%{jrelnk} -%{_jvmjardir}/%{jrelnk} -%{_jvmjardir}/%{sdkdir}/jaas*.jar -%{_jvmjardir}/%{sdkdir}/jce*jar -%{_jvmjardir}/%{sdkdir}/jdbc-stdext*jar -%{_jvmjardir}/%{sdkdir}/jndi*.jar -%{_jvmjardir}/%{sdkdir}/jsse*.jar -%{_jvmjardir}/%{sdkdir}/sasl*.jar +#%{_jvmjardir}/%{jrelnk} +#%{_jvmjardir}/%{sdkdir}/jaas*.jar +#%{_jvmjardir}/%{sdkdir}/jce*jar +#%{_jvmjardir}/%{sdkdir}/jdbc-stdext*jar +#%{_jvmjardir}/%{sdkdir}/jndi*.jar +#%{_jvmjardir}/%{sdkdir}/jsse*.jar +#%{_jvmjardir}/%{sdkdir}/sasl*.jar %dir %{_jvmdir}/%{jredir} %dir %{_jvmdir}/%{jredir}/bin -%{_jvmdir}/%{jredir}/bin/clhsdb -%{_jvmdir}/%{jredir}/bin/hsdb %{_jvmdir}/%{jredir}/bin/java %{_jvmdir}/%{jredir}/bin/jjs %{_jvmdir}/%{jredir}/bin/keytool @@ -948,6 +930,9 @@ fi #%{_jvmdir}/%{jredir}/lib/im %{_jvmdir}/%{jredir}/lib/images %{_jvmdir}/%{jredir}/lib/jce.jar +%{_jvmdir}/%{jredir}/lib/jfr.jar +%dir %{_jvmdir}/%{jredir}/lib/jfr +%{_jvmdir}/%{jredir}/lib/jfr/*.jfc %{_jvmdir}/%{jredir}/lib/jexec %{_jvmdir}/%{jredir}/lib/jsse.jar %{_jvmdir}/%{jredir}/lib/jvm.hprof.txt @@ -1026,6 +1011,9 @@ exit 0 #%doc README* %changelog +* Thu Jun 09 2022 Silvan Calarco 8u292b10_3.19.0-1mamba +- update to 8u292b10_3.19.0 + * Sat Oct 26 2019 Silvan Calarco 8u222b10_3.13.0-1mamba - update to 8u222b10_3.13.0 - provide sun-java and sun-java-runtime to fix multiple requiring packages from old java builds