From 7d8b7c0dcd6a8cf4400aceeca21ac9199d988ec4 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 23:48:56 +0100 Subject: [PATCH] update to 8u171b11_3.8.0 [release 8u171b11_3.8.0-1mamba;Sat Sep 15 2018] --- icedtea-autoupdate | 4 +- icedtea.spec | 202 ++++++++++++++++++++++++++++----------------- 2 files changed, 128 insertions(+), 78 deletions(-) diff --git a/icedtea-autoupdate b/icedtea-autoupdate index 71b0673..a5d137e 100644 --- a/icedtea-autoupdate +++ b/icedtea-autoupdate @@ -1,7 +1,7 @@ #!/bin/bash ICEDTEA_VERSION=`echo $1 | cut -d_ -f2` [ "$1" ] || exit 1 -for p in aarch64 corba hotspot jaxp jaxws jdk langtools openjdk; do - curl http://icedtea.wildebeest.org/download/drops/icedtea7/$ICEDTEA_VERSION/$p.tar.bz2 -o icedtea7-$p-$ICEDTEA_VERSION.tar.bz2 +for p in aarch32 corba hotspot jaxp jaxws jdk langtools nashorn openjdk shenandoah; do + curl http://icedtea.wildebeest.org/download/drops/icedtea8/$ICEDTEA_VERSION/$p.tar.xz -o icedtea8-$p-$ICEDTEA_VERSION.tar.xz done diff --git a/icedtea.spec b/icedtea.spec index 396e188..ef67846 100644 --- a/icedtea.spec +++ b/icedtea.spec @@ -10,7 +10,7 @@ %define gnome_jab_version 1.23.0 %define gnome_jab_majorver %(echo %gnome_jab_version | cut -d. -f 1-2) -%define drops_url http://icedtea.wildebeest.org/download/drops/icedtea7 +%define drops_url http://icedtea.wildebeest.org/download/drops/icedtea%{javaver} # gcj bootstrap %if "%{stage1}" != "1" @@ -39,10 +39,14 @@ %define archbuild amd64 %endif +%ifarch arm +%define archbuild aarch32 +%endif + #%define buildoutputdir openjdk/build/linux-%{archbuild} %define buildoutputdir openjdk.build -%define javaver 7 +%define javaver 8 %define origin openjdk %define buildver 0 @@ -66,7 +70,7 @@ #%endif Name: icedtea -Version: 7u91_2.6.3 +Version: 8u171b11_3.8.0 Release: 1mamba Summary: The IcedTea project provides a harness to build the openjdk Group: System/Libraries/Java @@ -75,20 +79,17 @@ Distribution: openmamba Packager: Silvan Calarco URL: http://icedtea.classpath.org/ Source0: http://icedtea.wildebeest.org/download/source/icedtea-%{icedtea_version}.tar.xz -Source1: %{drops_url}/icedtea7-openjdk-%{icedtea_version}.tar.bz2 +Source1: %{drops_url}/icedtea%{javaver}-openjdk-%{icedtea_version}.tar.xz Source3: icedtea-autoupdate -Source7: %{drops_url}/icedtea7-hotspot-%{icedtea_version}.tar.bz2 -Source8: %{drops_url}/icedtea7-jdk-%{icedtea_version}.tar.bz2 -Source10: %{drops_url}/icedtea7-jaxp-%{icedtea_version}.tar.bz2 -Source11: %{drops_url}/icedtea7-jaxws-%{icedtea_version}.tar.bz2 -Source12: %{drops_url}/icedtea7-corba-%{icedtea_version}.tar.bz2 -Source13: %{drops_url}/icedtea7-langtools-%{icedtea_version}.tar.bz2 -#Source2: %{gnome_jab_url}%{gnome_jab_majorver}/java-access-bridge-%{gnome_jab_version}.tar.bz2 -# http://sources.redhat.com/mauve/ -# cvs -f -d :pserver:anoncvs@sources.redhat.com:/cvs/mauve -checkout -c -# wget ftp://sources.redhat.com/pub/mauve/snapshot/mauve-nigthly.tar.bz mauve-%(date '+%Y-%m-%d').tar.bz2 -#Source5: mauve-%{mauve_date}.tar.gz -#Source6: mauve_tests +Source7: %{drops_url}/icedtea%{javaver}-hotspot-%{icedtea_version}.tar.xz +Source8: %{drops_url}/icedtea%{javaver}-jdk-%{icedtea_version}.tar.xz +Source10: %{drops_url}/icedtea%{javaver}-jaxp-%{icedtea_version}.tar.xz +Source11: %{drops_url}/icedtea%{javaver}-jaxws-%{icedtea_version}.tar.xz +Source12: %{drops_url}/icedtea%{javaver}-corba-%{icedtea_version}.tar.xz +Source13: %{drops_url}/icedtea%{javaver}-langtools-%{icedtea_version}.tar.xz +Source14: %{drops_url}/icedtea%{javaver}-aarch32-%{icedtea_version}.tar.xz +Source15: %{drops_url}/icedtea%{javaver}-nashorn-%{icedtea_version}.tar.xz +Source16: %{drops_url}/icedtea%{javaver}-shenandoah-%{icedtea_version}.tar.xz License: GPL (with exceptions) ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -181,13 +182,11 @@ BuildRequires: xml-commons-apis %if %enabled_systemtap BuildRequires: systemtap-sdt-devel %endif +%ifarch arm +BuildRequires: libatomic-devel +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-root -# TODO -# Prevent brp-java-repack-jars from being run. -#%define __jar_repack 0 -# checking for xvfb-run... no - %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. @@ -226,7 +225,9 @@ Provides: %{_bindir}/serialver Provides: %{_bindir}/wsgen Provides: %{_bindir}/wsimport Provides: %{_bindir}/xjc -Provides: java-openjdk = 7 +Provides: java-openjdk = %{javaver} +Provides: java-openjdk +Obsoletes: java-openjdk %description -n java-openjdk%{javaver} The OpenJDK Development Environment. @@ -256,7 +257,9 @@ Provides: %{_bindir}/rmiregistry Provides: %{_bindir}/servertool Provides: %{_bindir}/tnameserv Provides: %{_bindir}/unpack200 -Provides: java-openjdk-runtime = 7 +Provides: java-openjdk-runtime = %{javaver} +Provides: java-openjdk-runtime +Obsoletes: java-openjdk-runtime %description -n java-openjdk%{javaver}-runtime The OpenJDK runtime environment. @@ -266,6 +269,8 @@ Summary: OpenJDK Demos Group: Development/Languages Requires: java-openjdk%{javaver} = %{?epoch:%epoch:}%{version}-%{release} Provides: java-demo = %{javaver} +Provides: java-openjdk-demo +Obsoletes: java-openjdk-demo %description -n java-openjdk%{javaver}-demo The OpenJDK demos. @@ -275,6 +280,8 @@ Summary: OpenJDK Source Bundle Group: Development/Languages Requires: java-openjdk%{javaver} = %{?epoch:%epoch:}%{version}-%{release} Provides: java-src = %{javaver} +Provides: java-openjdk-src +Obsoletes: java-openjdk-src %description -n java-openjdk%{javaver}-src The OpenJDK source bundle @@ -285,6 +292,8 @@ Group: Documentation 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 %description -n java-openjdk%{javaver}-javadoc The OpenJDK API documentation. @@ -301,6 +310,8 @@ sed "s|-Xshare:dump|-Xshare:dump -Xmx512m|" Makefile.in %build #:<< _EOF unset JAVA_HOME +#export JAVA_HOME=/usr/lib/jvm/java-1.8.0-sun/ +export CCACHE= #./autogen.sh @@ -308,25 +319,36 @@ unset JAVA_HOME ./configure \ --disable-downloading \ --with-openjdk-src-zip=%{SOURCE1} \ +%ifarch arm + --with-hotspot-src-zip=%{SOURCE14} \ +%else --with-hotspot-src-zip=%{SOURCE7} \ +%endif --with-corba-src-zip=%{SOURCE12} \ --with-jaxp-src-zip=%{SOURCE10} \ --with-jaxws-src-zip=%{SOURCE11} \ --with-jdk-src-zip=%{SOURCE8} \ --with-langtools-src-zip=%{SOURCE13} \ + --with-nashorn-src-zip=%{SOURCE15} \ --with-pkgversion=%{distribution}-%{release}-%{_arch} \ --enable-nss \ - --with-rhino=$(build-classpath rhino) \ + --disable-ccache \ +%ifarch arm + --with-jdk-home=%{_jvmdir}/java-1.7.0-sun \ +%else + --with-jdk-home=%{_jvmdir}/java-1.8.0-sun \ +%endif %if "%{bootstrap}" != "1" --with-ecj-jar=$(build-classpath eclipse-ecj) \ - --with-jdk-home=%{_jvmdir}/java-openjdk \ --disable-bootstrap \ %else --with-ecj-jar=%{_datadir}/java/ecj.jar \ - --with-jdk-home=%{_jvmdir}/jdk \ - --with-gcj=gcj \ + --enable-bootstrap \ %endif +# --with-jdk-home=/usr/lib/jvm/java-1.8.0-sun/ \ + +# --with-rhino=$(build-classpath rhino) \ # --enable-pulse-java \ # --with-xalan2-jar=$(build-classpath xalan-j2) \ # --with-xalan2-serializer-jar=$(build-classpath xalan-j2-serializer) \ @@ -341,13 +363,18 @@ unset JAVA_HOME #make stamps/patch-ecj.stamp #%endif +#_EOF + make MEMORY_LIMIT=-J-Xmx512m patch +%ifarch arm +LD_PRELOAD=%{_libdir}/libatomic.so make MEMORY_LIMIT=-J-Xmx512m DISABLE_HOTSPOT_OS_VERSION_CHECK=ok +%else make MEMORY_LIMIT=-J-Xmx512m DISABLE_HOTSPOT_OS_VERSION_CHECK=ok - -export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image +%endif :<< ___EOF +export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image # Build Java Access Bridge for GNOME. pushd java-access-bridge-%{gnome_jab_version} patch -l -p1 < %{PATCH1} @@ -365,7 +392,9 @@ ___EOF %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -pushd %{buildoutputdir}/j2sdk-image +#% makeinstall DESTDIR=%{buildroot} prefix=%{_jvmdir}/%{sdkdir} + +pushd %{buildoutputdir}/images/j2sdk-image # Install main files. install -d -m 755 %{buildroot}%{_jvmdir}/%{sdkdir} @@ -493,22 +522,22 @@ if [ $1 -ge 1 ]; then fi for b in appletviewer apt extcheck javac jar jarsigner javadoc javah javap jconsole jdb jhat jinfo jmap jps jrunscript jsadebugd jstack jstat jstatd native2ascii policytool rmic schemagen serialver wsgen wsimport xjc ; do [ -L /usr/bin/$b -a "`readlink /usr/bin/$b`" != "/etc/alternatives/$b" ] && rm -f /usr/bin/$b - /usr/sbin/update-alternatives --install %{_bindir}/$b $b %{sdkbindir}/$b 65 + /usr/sbin/update-alternatives --install %{_bindir}/$b $b %{sdkbindir}/$b 70 done # legacy - /usr/sbin/update-alternatives --install %{javaprefix}/jdk jdk %{_jvmdir}/%{sdklnk} 65 + /usr/sbin/update-alternatives --install %{javaprefix}/jdk jdk %{_jvmdir}/%{sdklnk} 70 # default - /usr/sbin/update-alternatives --install %{javaprefix}/java-%{javaver}-%{origin} jdk_%{javaver}_%{origin} %{_jvmdir}/%{sdklnk} 65 + /usr/sbin/update-alternatives --install %{javaprefix}/java-%{javaver}-%{origin} jdk_%{javaver}_%{origin} %{_jvmdir}/%{sdklnk} 70 # x eclipse - /usr/sbin/update-alternatives --install %{javaprefix}/java-%{javaver} jdk_%{javaver} %{_jvmdir}/%{sdklnk} 65 - /usr/sbin/update-alternatives --install %{javaprefix}/java-%{origin} jdk_%{origin} %{_jvmdir}/%{sdklnk} 65 - /usr/sbin/update-alternatives --install %{javaprefix}/java jdk_java %{_jvmdir}/%{sdklnk} 65 + /usr/sbin/update-alternatives --install %{javaprefix}/java-%{javaver} jdk_%{javaver} %{_jvmdir}/%{sdklnk} 70 + /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} 65 - /usr/sbin/update-alternatives --install %{_jvmjardir}/java-%{javaver}-%{origin} jdk_%{javaver}_%{origin}_exports %{_jvmjardir}/%{sdklnk} 65 - /usr/sbin/update-alternatives --install %{_jvmjardir}/java jdk_java_exports %{_jvmjardir}/%{sdklnk} 65 - /usr/sbin/update-alternatives --install %{_jvmjardir}/java-%{origin} jdk_%{origin}_exports %{_jvmjardir}/%{sdklnk} 65 - /usr/sbin/update-alternatives --install %{_jvmjardir}/java-%{javaver} jdk_%{javaver}_exports %{_jvmjardir}/%{sdklnk} 65 + /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 || : @@ -581,18 +610,18 @@ fi rm -f /usr/bin/$b 2>/dev/null /usr/sbin/update-alternatives \ --install %{_bindir}/$b $b \ - %{jrebindir}/$b 65 + %{jrebindir}/$b 70 done - /usr/sbin/update-alternatives --install %{javaprefix}/jre jre %{_jvmdir}/%{jrelnk} 65 - /usr/sbin/update-alternatives --install %{javaprefix}/jre-%{javaver} jre_%{javaver} %{_jvmdir}/%{jrelnk} 65 - /usr/sbin/update-alternatives --install %{javaprefix}/jre-%{javaver}-%{origin} jre_%{javaver}_%{origin} %{_jvmdir}/%{jrelnk} 65 - /usr/sbin/update-alternatives --install %{javaprefix}/jre-%{origin} jre_%{origin} %{_jvmdir}/%{jrelnk} 65 + /usr/sbin/update-alternatives --install %{javaprefix}/jre jre %{_jvmdir}/%{jrelnk} 70 + /usr/sbin/update-alternatives --install %{javaprefix}/jre-%{javaver} jre_%{javaver} %{_jvmdir}/%{jrelnk} 70 + /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} 65 - /usr/sbin/update-alternatives --install %{_jvmjardir}/jre-%{origin} jre_%{origin}_exports %{_jvmjardir}/%{jrelnk} 65 - /usr/sbin/update-alternatives --install %{_jvmjardir}/jre-%{javaver}-%{origin} jre_%{javaver}_%{origin}_exports %{_jvmjardir}/%{jrelnk} 65 - /usr/sbin/update-alternatives --install %{_jvmjardir}/jre-%{javaver} jre_%{javaver}_exports %{_jvmjardir}/%{jrelnk} 65 + /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 || : @@ -657,7 +686,7 @@ fi #%{_jvmdir}/%{sdklnk} #%{_jvmjardir}/%{sdklnk} %{_jvmdir}/%{sdkdir}/bin/appletviewer -%{_jvmdir}/%{sdkdir}/bin/apt +#%{_jvmdir}/%{sdkdir}/bin/apt %{_jvmdir}/%{sdkdir}/bin/extcheck %{_jvmdir}/%{sdkdir}/bin/idlj %{_jvmdir}/%{sdkdir}/bin/jar @@ -671,8 +700,10 @@ fi %{_jvmdir}/%{sdkdir}/bin/jconsole %{_jvmdir}/%{sdkdir}/bin/jcmd %{_jvmdir}/%{sdkdir}/bin/jdb +%{_jvmdir}/%{sdkdir}/bin/jdeps %{_jvmdir}/%{sdkdir}/bin/jhat %{_jvmdir}/%{sdkdir}/bin/jinfo +%{_jvmdir}/%{sdkdir}/bin/jjs %{_jvmdir}/%{sdkdir}/bin/jmap %{_jvmdir}/%{sdkdir}/bin/jps %{_jvmdir}/%{sdkdir}/bin/jrunscript @@ -713,12 +744,13 @@ fi %ifnarch arm %{_jvmdir}/%{sdkdir}/lib/sa-jdi.jar %endif -%{_jvmdir}/%{sdkdir}/lib/tools.jar %dir %{_jvmdir}/%{sdkdir}/lib/%{archbuild} +%{_jvmdir}/%{sdkdir}/lib/%{archbuild}/libjawt.so %dir %{_jvmdir}/%{sdkdir}/lib/%{archbuild}/jli %{_jvmdir}/%{sdkdir}/lib/%{archbuild}/jli/libjli.so -%{_datadir}/applications/*jconsole%{javaver}.desktop -%{_datadir}/applications/*policytool%{javaver}.desktop +%{_jvmdir}/%{sdkdir}/lib/tools.jar +%{_datadir}/applications/jconsole%{javaver}.desktop +%{_datadir}/applications/policytool%{javaver}.desktop %if %enabled_systemtap %ifarch %{jitarches} %dir %{_jvmdir}/%{sdkdir}/tapset @@ -728,8 +760,8 @@ fi %endif %{_mandir}/man1/appletviewer-%{origin}%{javaver}.1* %{_mandir}/man1/appletviewer.1* -%{_mandir}/man1/apt-%{origin}%{javaver}.1* -%{_mandir}/man1/apt.1* +#%{_mandir}/man1/apt-%{origin}%{javaver}.1* +#%{_mandir}/man1/apt.1* %{_mandir}/man1/extcheck-%{origin}%{javaver}.1* %{_mandir}/man1/extcheck.1* %{_mandir}/man1/idlj-%{origin}%{javaver}.1* @@ -752,10 +784,14 @@ fi %{_mandir}/man1/jdb.1* %{_mandir}/man1/jcmd-%{origin}%{javaver}.1* %{_mandir}/man1/jcmd.1* +%{_mandir}/man1/jdeps-%{origin}%{javaver}.1* +%{_mandir}/man1/jdeps.1* %{_mandir}/man1/jhat-%{origin}%{javaver}.1* %{_mandir}/man1/jhat.1* %{_mandir}/man1/jinfo-%{origin}%{javaver}.1* %{_mandir}/man1/jinfo.1* +%{_mandir}/man1/jjs-%{origin}%{javaver}.1* +%{_mandir}/man1/jjs.1* %{_mandir}/man1/jmap-%{origin}%{javaver}.1* %{_mandir}/man1/jmap.1* %{_mandir}/man1/jps-%{origin}%{javaver}.1* @@ -803,6 +839,7 @@ fi %dir %{_jvmdir}/%{jredir} %dir %{_jvmdir}/%{jredir}/bin %{_jvmdir}/%{jredir}/bin/java +%{_jvmdir}/%{jredir}/bin/jjs %{_jvmdir}/%{jredir}/bin/keytool %{_jvmdir}/%{jredir}/bin/orbd %{_jvmdir}/%{jredir}/bin/pack200 @@ -822,18 +859,23 @@ fi %{_jvmdir}/%{jredir}/lib/cmm %{_jvmdir}/%{jredir}/lib/currency.data %{_jvmdir}/%{jredir}/lib/ext -%{_jvmdir}/%{jredir}/lib/fontconfig*.bfc -%{_jvmdir}/%{jredir}/lib/fontconfig*.src +%{_jvmdir}/%{jredir}/lib/tzdb.dat +#%{_jvmdir}/%{jredir}/lib/fontconfig*.bfc +#%{_jvmdir}/%{jredir}/lib/fontconfig*.src %dir %{_jvmdir}/%{jredir}/lib/%{archbuild} -%ifnarch x86_64 arm +%ifarch arm %dir %{_jvmdir}/%{jredir}/lib/%{archbuild}/client %{_jvmdir}/%{jredir}/lib/%{archbuild}/client/Xusage.txt +%{_jvmdir}/%{jredir}/lib/%{archbuild}/client/classes.jsa %{_jvmdir}/%{jredir}/lib/%{archbuild}/client/libjsig.so %{_jvmdir}/%{jredir}/lib/%{archbuild}/client/libjvm.so %endif -%dir %{_jvmdir}/%{jredir}/lib/%{archbuild}/headless -%{_jvmdir}/%{jredir}/lib/%{archbuild}/headless/libmawt.so -%{_jvmdir}/%{jredir}/lib/%{archbuild}/libjavasctp.so +%{_jvmdir}/%{jredir}/lib/%{archbuild}/libawt_headless.so +%{_jvmdir}/%{jredir}/lib/%{archbuild}/libawt_xawt.so +%{_jvmdir}/%{jredir}/lib/%{archbuild}/libj2sctp.so +#%dir %{_jvmdir}/%{jredir}/lib/%{archbuild}/headless +#%{_jvmdir}/%{jredir}/lib/%{archbuild}/headless/libmawt.so +#%{_jvmdir}/%{jredir}/lib/%{archbuild}/libjavasctp.so %dir %{_jvmdir}/%{jredir}/lib/%{archbuild}/jli %{_jvmdir}/%{jredir}/lib/%{archbuild}/jli/libjli.so %{_jvmdir}/%{jredir}/lib/%{archbuild}/jvm.cfg @@ -852,7 +894,7 @@ fi %{_jvmdir}/%{jredir}/lib/%{archbuild}/libjava_crw_demo.so %{_jvmdir}/%{jredir}/lib/%{archbuild}/libjawt.so %{_jvmdir}/%{jredir}/lib/%{archbuild}/libjdwp.so -%{_jvmdir}/%{jredir}/lib/%{archbuild}/libjavagtk.so +#%{_jvmdir}/%{jredir}/lib/%{archbuild}/libjavagtk.so %{_jvmdir}/%{jredir}/lib/%{archbuild}/libjavajpeg.so %{_jvmdir}/%{jredir}/lib/%{archbuild}/libjavalcms.so %{_jvmdir}/%{jredir}/lib/%{archbuild}/libjsig.so @@ -875,15 +917,15 @@ fi %{_jvmdir}/%{jredir}/lib/%{archbuild}/libzip.so #%dir %{_jvmdir}/%{jredir}/lib/%{archbuild}/native_threads #%{_jvmdir}/%{jredir}/lib/%{archbuild}/native_threads/libhpi.so +%ifnarch arm %dir %{_jvmdir}/%{jredir}/lib/%{archbuild}/server %{_jvmdir}/%{jredir}/lib/%{archbuild}/server/Xusage.txt -%ifnarch arm %{_jvmdir}/%{jredir}/lib/%{archbuild}/server/classes.jsa -%endif %{_jvmdir}/%{jredir}/lib/%{archbuild}/server/libjsig.so %{_jvmdir}/%{jredir}/lib/%{archbuild}/server/libjvm.so -%dir %{_jvmdir}/%{jredir}/lib/%{archbuild}/xawt -%{_jvmdir}/%{jredir}/lib/%{archbuild}/xawt/libmawt.so +%endif +#%dir %{_jvmdir}/%{jredir}/lib/%{archbuild}/xawt +#%{_jvmdir}/%{jredir}/lib/%{archbuild}/xawt/libmawt.so #%{_jvmdir}/%{jredir}/lib/im %{_jvmdir}/%{jredir}/lib/images %{_jvmdir}/%{jredir}/lib/jce.jar @@ -895,15 +937,17 @@ fi %{_jvmdir}/%{jredir}/lib/meta-index %{_jvmdir}/%{jredir}/lib/psfont.properties.ja %{_jvmdir}/%{jredir}/lib/resources.jar -%{_jvmdir}/%{jredir}/lib/rhino.jar +#%{_jvmdir}/%{jredir}/lib/rhino.jar %{_jvmdir}/%{jredir}/lib/rt.jar %{_jvmdir}/%{jredir}/lib/*.properties -%dir %{_jvmdir}/%{jredir}/lib/zi -%{_jvmdir}/%{jredir}/lib/zi/* +#%dir %{_jvmdir}/%{jredir}/lib/zi +#%{_jvmdir}/%{jredir}/lib/zi/* %dir %{_jvmdir}/%{jredir}/lib/security -#%{_jvmdir}/%{jredir}/lib/security/java.security.old -%{_jvmdir}/%{jredir}/lib/security/US_export_policy.jar -%{_jvmdir}/%{jredir}/lib/security/local_policy.jar +%{_jvmdir}/%{jredir}/lib/security/blacklisted.certs +%{_jvmdir}/%{jredir}/lib/security/policy/limited/US_export_policy.jar +%{_jvmdir}/%{jredir}/lib/security/policy/limited/local_policy.jar +%{_jvmdir}/%{jredir}/lib/security/policy/unlimited/US_export_policy.jar +%{_jvmdir}/%{jredir}/lib/security/policy/unlimited/local_policy.jar %{_jvmdir}/%{jredir}/lib/security/cacerts %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security @@ -946,7 +990,6 @@ fi %doc mauve-%{mauve_date}/mauve_output %doc test/jtreg-summary.log %endif -#%doc README.src %post -n java-openjdk%{javaver}-javadoc /usr/sbin/update-alternatives --install %{_javadocdir}/java javadocdir%{javaver}-%{origin} %{_javadocdir}/%{sdkdir}/api 70 @@ -954,11 +997,18 @@ exit 0 %files -n java-openjdk%{javaver}-javadoc %defattr(-,root,root) +%ifnarch arm %doc %{_javadocdir}/%{sdkdir} -%doc ChangeLog NEWS -%doc README* +%endif +%ifarch arm +%doc %{_datadir}/javadoc/java-8-openjdk-arm +#%doc ChangeLog NEWS +#%doc README* %changelog +* Sat Sep 15 2018 Silvan Calarco 8u171b11_3.8.0-1mamba +- update to 8u171b11_3.8.0 + * Wed Nov 18 2015 Silvan Calarco 7u91_2.6.3-1mamba - update to 7u91_2.6.3