@@ -3,7 +3,7 @@

 Summary:	OpenJDK

 Name:		openjdk8

 Version:	1.8.0.152

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	GNU GPL

 URL:		https://openjdk.java.net

 Group:		Development/Tools

@@ -13,7 +13,6 @@ Source0:	http://www.java.net/download/openjdk/jdk8/promoted/b131/openjdk-%{versi

 %define sha1 openjdk=bdb67157673789aa2ad368c9e237be7215097fdd

 Patch0:		Awt_build_headless_only.patch

 Patch1:		check-system-ca-certs.patch

-Patch2:         remove-cups.patch

 BuildRequires:  pcre-devel

 BuildRequires:	which

 BuildRequires:	zip

@@ -21,6 +20,7 @@ BuildRequires:	unzip

 BuildRequires:  zlib-devel

 BuildRequires:	ca-certificates

 BuildRequires:	chkconfig

+BuildRequires:  fontconfig-devel freetype2-devel glib-devel harfbuzz-devel

 Requires:       openjre8 = %{version}-%{release}

 Requires:       chkconfig

 Obsoletes:      openjdk <= %{version}

@@ -67,7 +67,7 @@ This package provides the runtime library class sources.

 %setup -qn openjdk-%{version}

 %patch0 -p1

 %patch1 -p1

-%patch2 -p1

+rm jdk/src/solaris/native/sun/awt/CUPSfuncs.c

 sed -i "s#\"ft2build.h\"#<ft2build.h>#g" jdk/src/share/native/sun/font/freetypeScaler.c

 sed -i '0,/BUILD_LIBMLIB_SRC/s/BUILD_LIBMLIB_SRC/BUILD_HEADLESS_ONLY := 1\nOPENJDK_TARGET_OS := linux\n&/' jdk/make/lib/Awt2dLibraries.gmk

@@ -237,6 +237,8 @@ rm -rf %{buildroot}/*

 %{_libdir}/jvm/OpenJDK-%{version}/src.zip

 %changelog

+*   Thu Dec 21 2017 Alexey Makhalov <amakhalov@vmware.com> 1.8.0.152-2

+-   Reduce list of published rpms dependencies

 *   Thu Oct 19 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.8.0.152-1

 -   Upgraded to version 1.8.0.152

 *   Thu Sep 14 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.8.0.141-2

new file mode 100644

@@ -0,0 +1,265 @@

+%define _use_internal_dependency_generator 0

+%global security_hardening none

+%define _jdk_update 151

+%define _jdk_build 13

+%define _repo_ver aarch64-jdk8u%{_jdk_update}-b%{_jdk_build}

+%define _url_src http://hg.openjdk.java.net/aarch64-port/jdk8u

+

+Summary:	OpenJDK

+Name:		openjdk8

+Version:	1.8.0.151

+Release:	1%{?dist}

+License:	GNU GPL

+URL:		http://hg.openjdk.java.net/aarch64-port/jdk8u/

+Group:		Development/Tools

+Vendor:		VMware, Inc.

+Distribution:   Photon

+Source0:	%{_url_src}/archive/jdk8u-%{_repo_ver}.tar.bz2

+%define sha1 jdk8u=d92f2f3633ca1f376dddc1d3c6d7ec53a54d7d63

+Source1:	%{_url_src}/corba/archive/corba-%{_repo_ver}.tar.bz2

+%define sha1 corba=a8cfcc8cd8817560059d7d121bb774334ae012b0

+Source2:	%{_url_src}/hotspot/archive/hotspot-%{_repo_ver}.tar.bz2

+%define sha1 hotspot=c9378ab34ee281e196206214ffe3174b2dfd2d80

+Source3:	%{_url_src}/jdk/archive/jdk-%{_repo_ver}.tar.bz2

+%define sha1 jdk-aarch64=5cc629011f0e6c2aa522e4ca6c8b602912431cbd

+Source4:	%{_url_src}/jaxws/archive/jaxws-%{_repo_ver}.tar.bz2

+%define sha1 jaxws=d3fd7bca75d6e8125c7968c9242129477d0fc0cb

+Source5:	%{_url_src}/jaxp/archive/jaxp-%{_repo_ver}.tar.bz2

+%define sha1 jaxp=229a83f8687bae8c1c51f2ea0010f3d2cf896072

+Source6:	%{_url_src}/langtools/archive/langtools-%{_repo_ver}.tar.bz2

+%define sha1 langtools=ec34f7adc4f66b687a33e1c8fbf0a4e44dafb0c1

+Source7:	%{_url_src}/nashorn/archive/nashorn-%{_repo_ver}.tar.bz2

+%define sha1 nashorn=aaf4d057bb3e5d8700f6b6d11d38fb9519c2ab29

+Patch0:		Awt_build_headless_only.patch

+Patch1:		check-system-ca-certs.patch

+BuildRequires:  pcre-devel

+BuildRequires:	which

+BuildRequires:	zip

+BuildRequires:	unzip

+BuildRequires:  zlib-devel

+BuildRequires:	ca-certificates

+BuildRequires:	chkconfig

+BuildRequires:  fontconfig-devel freetype2-devel glib-devel harfbuzz-devel

+Requires:       openjre8 = %{version}-%{release}

+Requires:       chkconfig

+Obsoletes:      openjdk <= %{version}

+AutoReqProv: 	no

+%define bootstrapjdk /usr/lib/jvm/OpenJDK-1.8.0.151

+%description

+The OpenJDK package installs java class library and javac java compiler.

+

+%package	-n openjre8

+Summary:	Java runtime environment

+AutoReqProv: 	no

+Obsoletes:      openjre <= %{version}

+Requires:       chkconfig

+Requires:	libstdc++

+%description	-n openjre8

+It contains the libraries files for Java runtime environment

+

+

+%package	sample

+Summary:	Sample java applications.

+Group:          Development/Languages/Java

+Obsoletes:      openjdk-sample <= %{version}

+Requires:       %{name} = %{version}-%{release}

+%description	sample

+It contains the Sample java applications.

+

+%package		doc

+Summary:		Documentation and demo applications for openjdk

+Group:          Development/Languages/Java

+Obsoletes:      openjdk-doc <= %{version}

+Requires:       %{name} = %{version}-%{release}

+%description	doc

+It contains the documentation and demo applications for openjdk

+

+%package 		src

+Summary:        OpenJDK Java classes for developers

+Group:          Development/Languages/Java

+Obsoletes:      openjdk-src <= %{version}

+Requires:       %{name} = %{version}-%{release}

+%description	src

+This package provides the runtime library class sources.

+

+%prep -p exit

+%setup -qn jdk8u-%{_repo_ver} -b1 -b2 -b3 -b4 -b5 -b6 -b7

+for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn

+do

+    mv ../${subrepo}-%{_repo_ver} ${subrepo}

+done

+%patch0 -p1

+%patch1 -p1

+rm jdk/src/solaris/native/sun/awt/CUPSfuncs.c

+sed -i "s#\"ft2build.h\"#<ft2build.h>#g" jdk/src/share/native/sun/font/freetypeScaler.c

+sed -i '0,/BUILD_LIBMLIB_SRC/s/BUILD_LIBMLIB_SRC/BUILD_HEADLESS_ONLY := 1\nOPENJDK_TARGET_OS := linux\n&/' jdk/make/lib/Awt2dLibraries.gmk

+

+%build

+chmod a+x ./configure

+unset JAVA_HOME &&

+./configure \

+	CUPS_NOT_NEEDED=yes \

+	--with-target-bits=64 \

+	--with-boot-jdk=%{bootstrapjdk} \

+	--disable-headful \

+	--with-cacerts-file=%{bootstrapjdk}/jre/lib/security/cacerts \

+	--with-extra-cxxflags="-Wno-error -std=gnu++98 -fno-delete-null-pointer-checks -fno-lifetime-dse" \

+	--with-extra-cflags="-std=gnu++98 -fno-delete-null-pointer-checks -Wno-error -fno-lifetime-dse" \

+	--with-freetype-include=/usr/include/freetype2 \

+	--with-freetype-lib=/usr/lib \

+	--with-stdc++lib=dynamic

+

+make \

+    DEBUG_BINARIES=true \

+    BUILD_HEADLESS_ONLY=1 \

+    OPENJDK_TARGET_OS=linux \

+    JAVAC_FLAGS=-g \

+    STRIP_POLICY=no_strip \

+    DISABLE_HOTSPOT_OS_VERSION_CHECK=ok \

+    CLASSPATH=%{bootstrapjdk}/jre \

+    POST_STRIP_CMD="" \

+    LOG=trace \

+    SCTP_WERROR=

+

+%install

+make DESTDIR=%{buildroot} install \

+	BUILD_HEADLESS_ONLY=yes \

+	OPENJDK_TARGET_OS=linux \

+	DISABLE_HOTSPOT_OS_VERSION_CHECK=ok \

+	CLASSPATH=%{bootstrapjdk}/jre

+

+install -vdm755 %{buildroot}%{_libdir}/jvm/OpenJDK-%{version}

+chown -R root:root %{buildroot}%{_libdir}/jvm/OpenJDK-%{version}

+install -vdm755 %{buildroot}%{_bindir}

+find /usr/local/jvm/openjdk-1.8.0-internal/jre/lib/aarch64 -iname \*.diz -delete

+mv /usr/local/jvm/openjdk-1.8.0-internal/* %{buildroot}%{_libdir}/jvm/OpenJDK-%{version}/

+

+%post

+alternatives --install %{_bindir}/javac javac %{_libdir}/jvm/OpenJDK-%{version}/bin/javac 2000 \

+  --slave %{_bindir}/appletviewer appletviewer %{_libdir}/jvm/OpenJDK-%{version}/bin/appletviewer \

+  --slave %{_bindir}/extcheck extcheck %{_libdir}/jvm/OpenJDK-%{version}/bin/extcheck \

+  --slave %{_bindir}/idlj idlj %{_libdir}/jvm/OpenJDK-%{version}/bin/idlj \

+  --slave %{_bindir}/jar jar %{_libdir}/jvm/OpenJDK-%{version}/bin/jar \

+  --slave %{_bindir}/jarsigner jarsigner %{_libdir}/jvm/OpenJDK-%{version}/bin/jarsigner \

+  --slave %{_bindir}/javadoc javadoc %{_libdir}/jvm/OpenJDK-%{version}/bin/javadoc \

+  --slave %{_bindir}/javah javah %{_libdir}/jvm/OpenJDK-%{version}/bin/javah \

+  --slave %{_bindir}/javap javap %{_libdir}/jvm/OpenJDK-%{version}/bin/javap \

+  --slave %{_bindir}/jcmd jcmd %{_libdir}/jvm/OpenJDK-%{version}/bin/jcmd \

+  --slave %{_bindir}/jconsole jconsole %{_libdir}/jvm/OpenJDK-%{version}/bin/jconsole \

+  --slave %{_bindir}/jdb jdb %{_libdir}/jvm/OpenJDK-%{version}/bin/jdb \

+  --slave %{_bindir}/jdeps jdeps %{_libdir}/jvm/OpenJDK-%{version}/bin/jdeps \

+  --slave %{_bindir}/jhat jhat %{_libdir}/jvm/OpenJDK-%{version}/bin/jhat \

+  --slave %{_bindir}/jinfo jinfo %{_libdir}/jvm/OpenJDK-%{version}/bin/jinfo \

+  --slave %{_bindir}/jmap jmap %{_libdir}/jvm/OpenJDK-%{version}/bin/jmap \

+  --slave %{_bindir}/jps jps %{_libdir}/jvm/OpenJDK-%{version}/bin/jps \

+  --slave %{_bindir}/jrunscript jrunscript %{_libdir}/jvm/OpenJDK-%{version}/bin/jrunscript \

+  --slave %{_bindir}/jsadebugd jsadebugd %{_libdir}/jvm/OpenJDK-%{version}/bin/jsadebugd \

+  --slave %{_bindir}/jstack jstack %{_libdir}/jvm/OpenJDK-%{version}/bin/jstack \

+  --slave %{_bindir}/jstat jstat %{_libdir}/jvm/OpenJDK-%{version}/bin/jstat \

+  --slave %{_bindir}/jstatd jstatd %{_libdir}/jvm/OpenJDK-%{version}/bin/jstatd \

+  --slave %{_bindir}/native2ascii native2ascii %{_libdir}/jvm/OpenJDK-%{version}/bin/native2ascii \

+  --slave %{_bindir}/rmic rmic %{_libdir}/jvm/OpenJDK-%{version}/bin/rmic \

+  --slave %{_bindir}/schemagen schemagen %{_libdir}/jvm/OpenJDK-%{version}/bin/schemagen \

+  --slave %{_bindir}/serialver serialver %{_libdir}/jvm/OpenJDK-%{version}/bin/serialver \

+  --slave %{_bindir}/wsgen wsgen %{_libdir}/jvm/OpenJDK-%{version}/bin/wsgen \

+  --slave %{_bindir}/wsimport wsimport %{_libdir}/jvm/OpenJDK-%{version}/bin/wsimport \

+  --slave %{_bindir}/xjc xjc %{_libdir}/jvm/OpenJDK-%{version}/bin/xjc

+/sbin/ldconfig

+

+%post -n openjre8

+alternatives --install %{_bindir}/java java %{_libdir}/jvm/OpenJDK-%{version}/jre/bin/java 2000 \

+  --slave %{_libdir}/jvm/jre jre %{_libdir}/jvm/OpenJDK-%{version}/jre \

+  --slave %{_bindir}/jjs jjs %{_libdir}/jvm/OpenJDK-%{version}/jre/bin/jjs \

+  --slave %{_bindir}/keytool keytool %{_libdir}/jvm/OpenJDK-%{version}/jre/bin/keytool \

+  --slave %{_bindir}/orbd orbd %{_libdir}/jvm/OpenJDK-%{version}/jre/bin/orbd \

+  --slave %{_bindir}/pack200 pack200 %{_libdir}/jvm/OpenJDK-%{version}/jre/bin/pack200 \

+  --slave %{_bindir}/rmid rmid %{_libdir}/jvm/OpenJDK-%{version}/jre/bin/rmid \

+  --slave %{_bindir}/rmiregistry rmiregistry %{_libdir}/jvm/OpenJDK-%{version}/jre/bin/rmiregistry \

+  --slave %{_bindir}/servertool servertool %{_libdir}/jvm/OpenJDK-%{version}/jre/bin/servertool \

+  --slave %{_bindir}/tnameserv tnameserv %{_libdir}/jvm/OpenJDK-%{version}/jre/bin/tnameserv \

+  --slave %{_bindir}/unpack200 unpack200 %{_libdir}/jvm/OpenJDK-%{version}/jre/bin/unpack200

+/sbin/ldconfig

+

+%postun

+alternatives --remove javac %{_libdir}/jvm/OpenJDK-%{version}/bin/javac

+/sbin/ldconfig

+

+%postun -n openjre8

+alternatives --remove java %{_libdir}/jvm/OpenJDK-%{version}/jre/bin/java

+/sbin/ldconfig

+

+%clean

+rm -rf %{buildroot}/*

+

+%files

+%defattr(-,root,root)

+%{_libdir}/jvm/OpenJDK-%{version}/ASSEMBLY_EXCEPTION

+%{_libdir}/jvm/OpenJDK-%{version}/LICENSE

+%{_libdir}/jvm/OpenJDK-%{version}/release

+%{_libdir}/jvm/OpenJDK-%{version}/THIRD_PARTY_README

+%{_libdir}/jvm/OpenJDK-%{version}/lib

+%{_libdir}/jvm/OpenJDK-%{version}/include/

+%{_libdir}/jvm/OpenJDK-%{version}/bin/extcheck

+%{_libdir}/jvm/OpenJDK-%{version}/bin/idlj

+%{_libdir}/jvm/OpenJDK-%{version}/bin/jar

+%{_libdir}/jvm/OpenJDK-%{version}/bin/jarsigner

+%{_libdir}/jvm/OpenJDK-%{version}/bin/java-rmi.cgi

+%{_libdir}/jvm/OpenJDK-%{version}/bin/javac

+%{_libdir}/jvm/OpenJDK-%{version}/bin/javadoc

+%{_libdir}/jvm/OpenJDK-%{version}/bin/javah

+%{_libdir}/jvm/OpenJDK-%{version}/bin/javap

+%{_libdir}/jvm/OpenJDK-%{version}/bin/jcmd

+%{_libdir}/jvm/OpenJDK-%{version}/bin/jconsole

+%{_libdir}/jvm/OpenJDK-%{version}/bin/jdb

+%{_libdir}/jvm/OpenJDK-%{version}/bin/jdeps

+%{_libdir}/jvm/OpenJDK-%{version}/bin/jhat

+%{_libdir}/jvm/OpenJDK-%{version}/bin/jinfo

+%{_libdir}/jvm/OpenJDK-%{version}/bin/jjs

+%{_libdir}/jvm/OpenJDK-%{version}/bin/jmap

+%{_libdir}/jvm/OpenJDK-%{version}/bin/jps

+%{_libdir}/jvm/OpenJDK-%{version}/bin/jrunscript

+%{_libdir}/jvm/OpenJDK-%{version}/bin/jsadebugd

+%{_libdir}/jvm/OpenJDK-%{version}/bin/jstack

+%{_libdir}/jvm/OpenJDK-%{version}/bin/jstat

+%{_libdir}/jvm/OpenJDK-%{version}/bin/jstatd

+%{_libdir}/jvm/OpenJDK-%{version}/bin/native2ascii

+%{_libdir}/jvm/OpenJDK-%{version}/bin/rmic

+%{_libdir}/jvm/OpenJDK-%{version}/bin/schemagen

+%{_libdir}/jvm/OpenJDK-%{version}/bin/serialver

+%{_libdir}/jvm/OpenJDK-%{version}/bin/wsgen

+%{_libdir}/jvm/OpenJDK-%{version}/bin/wsimport

+%{_libdir}/jvm/OpenJDK-%{version}/bin/xjc

+

+%files	-n openjre8

+%defattr(-,root,root)

+%dir %{_libdir}/jvm/OpenJDK-%{version}

+%{_libdir}/jvm/OpenJDK-%{version}/jre/

+%{_libdir}/jvm/OpenJDK-%{version}/bin/java

+%{_libdir}/jvm/OpenJDK-%{version}/bin/keytool

+%{_libdir}/jvm/OpenJDK-%{version}/bin/orbd

+%{_libdir}/jvm/OpenJDK-%{version}/bin/pack200

+%{_libdir}/jvm/OpenJDK-%{version}/bin/rmid

+%{_libdir}/jvm/OpenJDK-%{version}/bin/rmiregistry

+%{_libdir}/jvm/OpenJDK-%{version}/bin/servertool

+%{_libdir}/jvm/OpenJDK-%{version}/bin/tnameserv

+%{_libdir}/jvm/OpenJDK-%{version}/bin/unpack200

+%{_libdir}/jvm/OpenJDK-%{version}/lib/aarch64/jli/

+%exclude %{_libdir}/jvm/OpenJDK-%{version}/lib/aarch64/*.diz

+

+%files sample

+%defattr(-,root,root)

+%{_libdir}/jvm/OpenJDK-%{version}/sample/

+

+%files doc

+%defattr(-,root,root)

+%{_libdir}/jvm/OpenJDK-%{version}/man/

+%{_libdir}/jvm/OpenJDK-%{version}/demo

+

+%files src

+%defattr(-,root,root)

+%{_libdir}/jvm/OpenJDK-%{version}/src.zip

+

+%changelog

+*   Thu Dec 21 2017 Alexey Makhalov <amakhalov@vmware.com> 1.8.0.151-1

+-   Initial version of OpenJDK for aarch64. SPEC file was forked from

+    openjdk8-1.8.0.152-1 of x86_64

deleted file mode 100644

@@ -1,449 +0,0 @@

-diff -Naur openjdk-1.8.0-141/jdk/src/solaris/native/sun/awt/CUPSfuncs.c openjdk-1.8.0.141/jdk/src/solaris/native/sun/awt/CUPSfuncs.c

-+++ b/jdk/src/solaris/native/sun/awt/CUPSfuncs.c	1969-12-31 16:00:00.000000000 -0800

-@@ -1,445 +0,0 @@

--/*

-- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.

-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

-- *

-- * This code is free software; you can redistribute it and/or modify it

-- * under the terms of the GNU General Public License version 2 only, as

-- * published by the Free Software Foundation.  Oracle designates this

-- * particular file as subject to the "Classpath" exception as provided

-- * by Oracle in the LICENSE file that accompanied this code.

-- *

-- * This code is distributed in the hope that it will be useful, but WITHOUT

-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License

-- * version 2 for more details (a copy is included in the LICENSE file that

-- * accompanied this code).

-- *

-- * You should have received a copy of the GNU General Public License version

-- * 2 along with this work; if not, write to the Free Software Foundation,

-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.

-- *

-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA

-- * or visit www.oracle.com if you need additional information or have any

-- * questions.

-- */

--

--#include <jni.h>

--#include <jni_util.h>

--#include <jvm_md.h>

--#include <dlfcn.h>

--#include <cups/cups.h>

--#include <cups/ppd.h>

--

--//#define CUPS_DEBUG

--

--#ifdef CUPS_DEBUG

--#define DPRINTF(x, y) fprintf(stderr, x, y);

--#else

--#define DPRINTF(x, y)

--#endif

--

--typedef const char* (*fn_cupsServer)(void);

--typedef int (*fn_ippPort)(void);

--typedef http_t* (*fn_httpConnect)(const char *, int);

--typedef void (*fn_httpClose)(http_t *);

--typedef char* (*fn_cupsGetPPD)(const char *);

--typedef cups_dest_t* (*fn_cupsGetDest)(const char *name,

--    const char *instance, int num_dests, cups_dest_t *dests);

--typedef int (*fn_cupsGetDests)(cups_dest_t **dests);

--typedef void (*fn_cupsFreeDests)(int num_dests, cups_dest_t *dests);

--typedef ppd_file_t* (*fn_ppdOpenFile)(const char *);

--typedef void (*fn_ppdClose)(ppd_file_t *);

--typedef ppd_option_t* (*fn_ppdFindOption)(ppd_file_t *, const char *);

--typedef ppd_size_t* (*fn_ppdPageSize)(ppd_file_t *, char *);

--

--fn_cupsServer j2d_cupsServer;

--fn_ippPort j2d_ippPort;

--fn_httpConnect j2d_httpConnect;

--fn_httpClose j2d_httpClose;

--fn_cupsGetPPD j2d_cupsGetPPD;

--fn_cupsGetDest j2d_cupsGetDest;

--fn_cupsGetDests j2d_cupsGetDests;

--fn_cupsFreeDests j2d_cupsFreeDests;

--fn_ppdOpenFile j2d_ppdOpenFile;

--fn_ppdClose j2d_ppdClose;

--fn_ppdFindOption j2d_ppdFindOption;

--fn_ppdPageSize j2d_ppdPageSize;

--

--

--/*

-- * Initialize library functions.

-- * // REMIND : move tab , add dlClose before return

-- */

--JNIEXPORT jboolean JNICALL

--Java_sun_print_CUPSPrinter_initIDs(JNIEnv *env,

--                                         jobject printObj) {

--  void *handle = dlopen(VERSIONED_JNI_LIB_NAME("cups", "2"),

--                        RTLD_LAZY | RTLD_GLOBAL);

--

--  if (handle == NULL) {

--    handle = dlopen(JNI_LIB_NAME("cups"), RTLD_LAZY | RTLD_GLOBAL);

--    if (handle == NULL) {

--      return JNI_FALSE;

--    }

--  }

--

--  j2d_cupsServer = (fn_cupsServer)dlsym(handle, "cupsServer");

--  if (j2d_cupsServer == NULL) {

--    dlclose(handle);

--    return JNI_FALSE;

--  }

--

--  j2d_ippPort = (fn_ippPort)dlsym(handle, "ippPort");

--  if (j2d_ippPort == NULL) {

--    dlclose(handle);

--    return JNI_FALSE;

--  }

--

--  j2d_httpConnect = (fn_httpConnect)dlsym(handle, "httpConnect");

--  if (j2d_httpConnect == NULL) {

--    dlclose(handle);

--    return JNI_FALSE;

--  }

--

--  j2d_httpClose = (fn_httpClose)dlsym(handle, "httpClose");

--  if (j2d_httpClose == NULL) {

--    dlclose(handle);

--    return JNI_FALSE;

--  }

--

--  j2d_cupsGetPPD = (fn_cupsGetPPD)dlsym(handle, "cupsGetPPD");

--  if (j2d_cupsGetPPD == NULL) {

--    dlclose(handle);

--    return JNI_FALSE;

--  }

--

--  j2d_cupsGetDest = (fn_cupsGetDest)dlsym(handle, "cupsGetDest");

--  if (j2d_cupsGetDest == NULL) {

--    dlclose(handle);

--    return JNI_FALSE;

--  }

--

--  j2d_cupsGetDests = (fn_cupsGetDests)dlsym(handle, "cupsGetDests");

--  if (j2d_cupsGetDests == NULL) {

--    dlclose(handle);

--    return JNI_FALSE;

--  }

--

--  j2d_cupsFreeDests = (fn_cupsFreeDests)dlsym(handle, "cupsFreeDests");

--  if (j2d_cupsFreeDests == NULL) {

--    dlclose(handle);

--    return JNI_FALSE;

--  }

--

--  j2d_ppdOpenFile = (fn_ppdOpenFile)dlsym(handle, "ppdOpenFile");

--  if (j2d_ppdOpenFile == NULL) {

--    dlclose(handle);

--    return JNI_FALSE;

--

--  }

--

--  j2d_ppdClose = (fn_ppdClose)dlsym(handle, "ppdClose");

--  if (j2d_ppdClose == NULL) {

--    dlclose(handle);

--    return JNI_FALSE;

--

--  }

--

--  j2d_ppdFindOption = (fn_ppdFindOption)dlsym(handle, "ppdFindOption");

--  if (j2d_ppdFindOption == NULL) {

--    dlclose(handle);

--    return JNI_FALSE;

--  }

--

--  j2d_ppdPageSize = (fn_ppdPageSize)dlsym(handle, "ppdPageSize");

--  if (j2d_ppdPageSize == NULL) {

--    dlclose(handle);

--    return JNI_FALSE;

--  }

--

--  return JNI_TRUE;

--}

--

--/*

-- * Gets CUPS server name.

-- *

-- */

--JNIEXPORT jstring JNICALL

--Java_sun_print_CUPSPrinter_getCupsServer(JNIEnv *env,

--                                         jobject printObj)

--{

--    jstring cServer = NULL;

--    const char* server = j2d_cupsServer();

--    if (server != NULL) {

--        // Is this a local domain socket?

--        if (strncmp(server, "/", 1) == 0) {

--            cServer = JNU_NewStringPlatform(env, "localhost");

--        } else {

--            cServer = JNU_NewStringPlatform(env, server);

--        }

--    }

--    return cServer;

--}

--

--/*

-- * Gets CUPS port name.

-- *

-- */

--JNIEXPORT jint JNICALL

--Java_sun_print_CUPSPrinter_getCupsPort(JNIEnv *env,

--                                         jobject printObj)

--{

--    int port = j2d_ippPort();

--    return (jint) port;

--}

--

--

--/*

-- * Gets CUPS default printer name.

-- *

-- */

--JNIEXPORT jstring JNICALL

--Java_sun_print_CUPSPrinter_getCupsDefaultPrinter(JNIEnv *env,

--                                                  jobject printObj)

--{

--    jstring cDefPrinter = NULL;

--    cups_dest_t *dests;

--    char *defaultPrinter = NULL;

--    int num_dests = j2d_cupsGetDests(&dests);

--    int i = 0;

--    cups_dest_t *dest = j2d_cupsGetDest(NULL, NULL, num_dests, dests);

--    if (dest != NULL) {

--        defaultPrinter = dest->name;

--        if (defaultPrinter != NULL) {

--            cDefPrinter = JNU_NewStringPlatform(env, defaultPrinter);

--        }

--    }

--    j2d_cupsFreeDests(num_dests, dests);

--    return cDefPrinter;

--}

--

--/*

-- * Checks if connection can be made to the server.

-- *

-- */

--JNIEXPORT jboolean JNICALL

--Java_sun_print_CUPSPrinter_canConnect(JNIEnv *env,

--                                      jobject printObj,

--                                      jstring server,

--                                      jint port)

--{

--    const char *serverName;

--    serverName = (*env)->GetStringUTFChars(env, server, NULL);

--    if (serverName != NULL) {

--        http_t *http = j2d_httpConnect(serverName, (int)port);

--        (*env)->ReleaseStringUTFChars(env, server, serverName);

--        if (http != NULL) {

--            j2d_httpClose(http);

--            return JNI_TRUE;

--        }

--    }

--    return JNI_FALSE;

--}

--

--

--/*

-- * Returns list of media: pages + trays

-- */

--JNIEXPORT jobjectArray JNICALL

--Java_sun_print_CUPSPrinter_getMedia(JNIEnv *env,

--                                         jobject printObj,

--                                         jstring printer)

--{

--    ppd_file_t *ppd;

--    ppd_option_t *optionTray, *optionPage;

--    ppd_choice_t *choice;

--    const char *name;

--    const char *filename;

--    int i, nTrays=0, nPages=0, nTotal=0;

--    jstring utf_str;

--    jclass cls;

--    jobjectArray nameArray = NULL;

--

--    name = (*env)->GetStringUTFChars(env, printer, NULL);

--    if (name == NULL) {

--        (*env)->ExceptionClear(env);

--        JNU_ThrowOutOfMemoryError(env, "Could not create printer name");

--        return NULL;

--    }

--

--    // NOTE: cupsGetPPD returns a pointer to a filename of a temporary file.

--    // unlink() must be caled to remove the file when finished using it.

--    filename = j2d_cupsGetPPD(name);

--    (*env)->ReleaseStringUTFChars(env, printer, name);

--    CHECK_NULL_RETURN(filename, NULL);

--

--    cls = (*env)->FindClass(env, "java/lang/String");

--    CHECK_NULL_RETURN(cls, NULL);

--

--    if ((ppd = j2d_ppdOpenFile(filename)) == NULL) {

--        unlink(filename);

--        DPRINTF("CUPSfuncs::unable to open PPD  %s\n", filename);

--        return NULL;

--    }

--

--    optionPage = j2d_ppdFindOption(ppd, "PageSize");

--    if (optionPage != NULL) {

--        nPages = optionPage->num_choices;

--    }

--

--    optionTray = j2d_ppdFindOption(ppd, "InputSlot");

--    if (optionTray != NULL) {

--        nTrays = optionTray->num_choices;

--    }

--

--    if ((nTotal = (nPages+nTrays) *2) > 0) {

--        nameArray = (*env)->NewObjectArray(env, nTotal, cls, NULL);

--        if (nameArray == NULL) {

--            unlink(filename);

--            j2d_ppdClose(ppd);

--            DPRINTF("CUPSfuncs::bad alloc new array\n", "")

--            (*env)->ExceptionClear(env);

--            JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError");

--            return NULL;

--        }

--

--        for (i = 0; optionPage!=NULL && i<nPages; i++) {

--            choice = (optionPage->choices)+i;

--            utf_str = JNU_NewStringPlatform(env, choice->text);

--            if (utf_str == NULL) {

--                unlink(filename);

--                j2d_ppdClose(ppd);

--                DPRINTF("CUPSfuncs::bad alloc new string ->text\n", "")

--                JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError");

--                return NULL;

--            }

--            (*env)->SetObjectArrayElement(env, nameArray, i*2, utf_str);

--            (*env)->DeleteLocalRef(env, utf_str);

--            utf_str = JNU_NewStringPlatform(env, choice->choice);

--            if (utf_str == NULL) {

--                unlink(filename);

--                j2d_ppdClose(ppd);

--                DPRINTF("CUPSfuncs::bad alloc new string ->choice\n", "")

--                JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError");

--                return NULL;

--            }

--            (*env)->SetObjectArrayElement(env, nameArray, i*2+1, utf_str);

--            (*env)->DeleteLocalRef(env, utf_str);

--        }

--

--        for (i = 0; optionTray!=NULL && i<nTrays; i++) {

--            choice = (optionTray->choices)+i;

--            utf_str = JNU_NewStringPlatform(env, choice->text);

--            if (utf_str == NULL) {

--                unlink(filename);

--                j2d_ppdClose(ppd);

--                DPRINTF("CUPSfuncs::bad alloc new string text\n", "")

--                JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError");

--                return NULL;

--            }

--            (*env)->SetObjectArrayElement(env, nameArray,

--                                          (nPages+i)*2, utf_str);

--            (*env)->DeleteLocalRef(env, utf_str);

--            utf_str = JNU_NewStringPlatform(env, choice->choice);

--            if (utf_str == NULL) {

--                unlink(filename);

--                j2d_ppdClose(ppd);

--                DPRINTF("CUPSfuncs::bad alloc new string choice\n", "")

--                JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError");

--                return NULL;

--            }

--            (*env)->SetObjectArrayElement(env, nameArray,

--                                          (nPages+i)*2+1, utf_str);

--            (*env)->DeleteLocalRef(env, utf_str);

--        }

--    }

--    j2d_ppdClose(ppd);

--    unlink(filename);

--    return nameArray;

--}

--

--

--/*

-- * Returns list of page sizes and imageable area.

-- */

--JNIEXPORT jfloatArray JNICALL

--Java_sun_print_CUPSPrinter_getPageSizes(JNIEnv *env,

--                                         jobject printObj,

--                                         jstring printer)

--{

--    ppd_file_t *ppd;

--    ppd_option_t *option;

--    ppd_choice_t *choice;

--    ppd_size_t *size;

--

--    const char *name = (*env)->GetStringUTFChars(env, printer, NULL);

--    if (name == NULL) {

--        (*env)->ExceptionClear(env);

--        JNU_ThrowOutOfMemoryError(env, "Could not create printer name");

--        return NULL;

--    }

--    const char *filename;

--    int i;

--    jobjectArray sizeArray = NULL;

--    jfloat *dims;

--

--    // NOTE: cupsGetPPD returns a pointer to a filename of a temporary file.

--    // unlink() must be called to remove the file after using it.

--    filename = j2d_cupsGetPPD(name);

--    (*env)->ReleaseStringUTFChars(env, printer, name);

--    CHECK_NULL_RETURN(filename, NULL);

--    if ((ppd = j2d_ppdOpenFile(filename)) == NULL) {

--        unlink(filename);

--        DPRINTF("unable to open PPD  %s\n", filename)

--        return NULL;

--    }

--    option = j2d_ppdFindOption(ppd, "PageSize");

--    if (option != NULL && option->num_choices > 0) {

--        // create array of dimensions - (num_choices * 6)

--        //to cover length & height

--        DPRINTF( "CUPSfuncs::option->num_choices %d\n", option->num_choices)

--        // +1 is for storing the default media index

--        sizeArray = (*env)->NewFloatArray(env, option->num_choices*6+1);

--        if (sizeArray == NULL) {

--            unlink(filename);

--            j2d_ppdClose(ppd);

--            DPRINTF("CUPSfuncs::bad alloc new float array\n", "")

--            (*env)->ExceptionClear(env);

--            JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError");

--            return NULL;

--        }

--

--        dims = (*env)->GetFloatArrayElements(env, sizeArray, NULL);

--        if (dims == NULL) {

--            unlink(filename);

--            j2d_ppdClose(ppd);

--            (*env)->ExceptionClear(env);

--            JNU_ThrowOutOfMemoryError(env, "Could not create printer name");

--            return NULL;

--        }

--        for (i = 0; i<option->num_choices; i++) {

--            choice = (option->choices)+i;

--            // get the index of the default page

--            if (!strcmp(choice->choice, option->defchoice)) {

--                dims[option->num_choices*6] = (float)i;

--            }

--            size = j2d_ppdPageSize(ppd, choice->choice);

--            if (size != NULL) {

--                // paper width and height

--                dims[i*6] = size->width;

--                dims[(i*6)+1] = size->length;

--                // paper printable area

--                dims[(i*6)+2] = size->left;

--                dims[(i*6)+3] = size->top;

--                dims[(i*6)+4] = size->right;

--                dims[(i*6)+5] = size->bottom;

--            }

--        }

--

--        (*env)->ReleaseFloatArrayElements(env, sizeArray, dims, 0);

--    }

--

--    j2d_ppdClose(ppd);

--    unlink(filename);

--    return sizeArray;

--}

@@ -329,7 +329,7 @@ class SpecParser(object):

     def readDefinition(self,line):

         listDefines=line.split()

         if len(listDefines) == 3:

-           self.defs[listDefines[1]] = listDefines[2]

+           self.defs[listDefines[1]] = self.replaceMacros(listDefines[2])

            return True

         return False

@@ -165,6 +165,10 @@ class ToolChainUtils(object):

             pkgUtils=PackageUtils(self.logName,self.logPath)

             print "DEBUG:" + package

             if "openjre8" in packageName or "openjdk8" in packageName:

+                # x86_64 has openjdk/jre as a published rpms but aarch64 has openjdk8/jre8

+                # Remove this condition after publishxrpms for x86_^4 got updated

+                if (package == "openjdk" or package == "openjre") and (platform.machine() == "aarch64"):

+                    package = package + "8"

                 rpmFile=self.findRPMFileInGivenLocation(package, constants.prevPublishXRPMRepo)

             else:

                 rpmFile=self.findRPMFileInGivenLocation(package, constants.prevPublishRPMRepo)

@@ -212,15 +212,10 @@ class constants(object):

         "go"]

     perPackageToolChain = dict.fromkeys(["openjdk8", "openjdk8-doc", "openjdk8-src", "openjdk8-sample", "openjre8" ], [

-        "glib-devel",

         "icu-devel",

         "openjdk",

         "openjre",

         "icu",

-        "harfbuzz",

-        "harfbuzz-devel",

-        "freetype2",

-        "freetype2-devel",

         "alsa-lib",

         "alsa-lib-devel",

         "xcb-proto",

@@ -229,12 +224,10 @@ class constants(object):

         "util-macros",

         "xtrans",

         "libxcb-devel",

-        "fontconfig-devel",

         "proto",

         "libXdmcp",

         "libxcb",

         "libXau",

-        "fontconfig",

         "xtrans-devel",

         "libX11",

         "libX11-devel",

@@ -347,7 +340,8 @@ class constants(object):

     # list of spec files to skip for parsing for given arch

     skipSpecsForArch={

         "x86_64":[

-            "u-boot-rpi3.spec"

+            "u-boot-rpi3.spec",

+            "openjdk8_aarch64.spec"

             ],

         "aarch64":[

             # fakeroot-ng does not support aarch64

@@ -1,2 +1,31 @@

 noarch/proto-7.7-1.noarch.rpm

 noarch/util-macros-1.19.0-1.noarch.rpm

+aarch64/openjdk8-1.8.0.151-1.ph2.aarch64.rpm

+aarch64/openjre8-1.8.0.151-1.ph2.aarch64.rpm

+aarch64/alsa-lib-1.1.5-1.aarch64.rpm

+aarch64/alsa-lib-devel-1.1.5-1.aarch64.rpm

+aarch64/icu-55.1-1.aarch64.rpm

+aarch64/icu-devel-55.1-1.aarch64.rpm

+aarch64/libICE-1.0.9-1.aarch64.rpm

+aarch64/libICE-devel-1.0.9-1.aarch64.rpm

+aarch64/libSM-1.2.2-1.aarch64.rpm

+aarch64/libSM-devel-1.2.2-1.aarch64.rpm

+aarch64/libX11-1.6.3-2.aarch64.rpm

+aarch64/libX11-devel-1.6.3-2.aarch64.rpm

+aarch64/libXau-1.0.8-1.aarch64.rpm

+aarch64/libXau-devel-1.0.8-1.aarch64.rpm

+aarch64/libxcb-1.11-1.aarch64.rpm

+aarch64/libxcb-devel-1.11-1.aarch64.rpm

+aarch64/libXdmcp-1.1.2-1.aarch64.rpm

+aarch64/libXdmcp-devel-1.1.2-1.aarch64.rpm

+aarch64/libXext-1.3.3-1.aarch64.rpm

+aarch64/libXext-devel-1.3.3-1.aarch64.rpm

+aarch64/libXmu-1.1.2-1.aarch64.rpm

+aarch64/libXmu-devel-1.1.2-1.aarch64.rpm

+aarch64/libXrender-0.9.8-1.aarch64.rpm

+aarch64/libXrender-devel-0.9.8-1.aarch64.rpm

+aarch64/libXt-1.1.4-1.aarch64.rpm

+aarch64/libXt-devel-1.1.4-1.aarch64.rpm

+aarch64/xcb-proto-1.11-1.aarch64.rpm

+aarch64/xtrans-1.3.5-2.aarch64.rpm

+aarch64/xtrans-devel-1.3.5-2.aarch64.rpm