openjdk11: Use openjdk10 from publishxrpms

Deprecate openjdk10 from photon 4.0 Change-Id: I6ff629182e8ef23d3109d57370fb0a232bbe8ad3 Signed-off-by: Tapas Kundu <[email protected]> Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/14911
gflex · Dec 20, 2021 · a2093d5 · a2093d5
1 parent 07ca5e6
commit a2093d5
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 37 deletions.
diff --git a/SPECS/openjdk10/build-with-latest-make.patch → ...CS/openjdk10/build-with-latest-make.patch b/SPECS/openjdk10/build-with-latest-make.patch → ...CS/openjdk10/build-with-latest-make.patch
diff --git a/SPECS/openjdk10/openjdk10.spec → PUBLISHRPMS_SPECS/openjdk10/openjdk10.spec b/SPECS/openjdk10/openjdk10.spec → PUBLISHRPMS_SPECS/openjdk10/openjdk10.spec
@@ -59,6 +59,7 @@ Requires:       %{name} = %{version}-%{release}
 This package provides the runtime library class sources.
 
 %prep -p exit
+# Using autosetup is not feasible
 %setup -qn openjdk-%{version}
 %patch0 -p1
 
@@ -88,6 +89,7 @@ make \
 
 %install
 unset JAVA_HOME &&
+# make doesn't support _smp_mflags
 make install
 
 install -vdm755 %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version}

diff --git a/SPECS/openjdk10/generate_source_tarball_10.sh b/SPECS/openjdk10/generate_source_tarball_10.sh
diff --git a/SPECS/openjdk11/openjdk11.spec b/SPECS/openjdk11/openjdk11.spec
@@ -5,7 +5,7 @@
 Summary:	OpenJDK
 Name:		openjdk11
 Version:	11.0.9
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GNU General Public License V2
 URL:		https://openjdk.java.net
 Group:		Development/Tools
@@ -23,11 +23,10 @@ BuildRequires:	ca-certificates
 BuildRequires:	chkconfig
 BuildRequires:  freetype2
 BuildRequires:  fontconfig-devel freetype2-devel glib-devel harfbuzz-devel elfutils-libelf-devel
-BuildRequires:  openjdk10
 Requires:       chkconfig
 Obsoletes:      openjdk <= %{version}
 AutoReqProv: 	no
-%define ExtraBuildRequires icu-devel, cups, cups-devel, xorg-proto-devel, libXtst, libXtst-devel, libXfixes, libXfixes-devel, libXi, libXi-devel, openjdk, openjre, icu, alsa-lib, alsa-lib-devel, xcb-proto, libXdmcp-devel, libXau-devel, util-macros, xtrans, libxcb-devel, proto, libXdmcp, libxcb, libXau, xtrans-devel, libX11, libX11-devel, libXext, libXext-devel, libICE-devel, libSM, libICE, libSM-devel, libXt, libXmu, libXt-devel, libXmu-devel, libXrender, libXrender-devel, libXrandr, libXrandr-devel
+%define ExtraBuildRequires icu-devel, cups, cups-devel, xorg-proto-devel, libXtst, libXtst-devel, libXfixes, libXfixes-devel, libXi, libXi-devel, openjdk, openjre, icu, alsa-lib, alsa-lib-devel, xcb-proto, libXdmcp-devel, libXau-devel, util-macros, xtrans, libxcb-devel, proto, libXdmcp, libxcb, libXau, xtrans-devel, libX11, libX11-devel, libXext, libXext-devel, libICE-devel, libSM, libICE, libSM-devel, libXt, libXmu, libXt-devel, libXmu-devel, libXrender, libXrender-devel, libXrandr, libXrandr-devel, openjre10, openjdk10
 %define bootstrapjdkversion 1.8.0.112
 %define jdk_major_version 1.11.0
 
@@ -51,7 +50,7 @@ Requires:       %{name} = %{version}-%{release}
 This package provides the runtime library class sources.
 
 %prep -p exit
-%setup -qn openjdk-%{version}
+%autosetup -n openjdk-%{version}
 
 %build
 chmod a+x ./configur*
@@ -79,6 +78,7 @@ make \
 
 %install
 unset JAVA_HOME &&
+# make doesn't support _smp_mflags
 make install
 
 install -vdm755 %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version}
@@ -189,6 +189,8 @@ rm -rf %{_libdir}/jvm/OpenJDK-*
 %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/lib/src.zip
 
 %changelog
+*   Wed Dec 15 2021 Tapas Kundu <[email protected]> 11.0.9-2
+-   Use openjdk10 from PublishXrpms
 *   Wed Oct 21 2020 Tapas Kundu <[email protected]> 11.0.9-1
 -   Updated to 11.0.9 tag - jdk-11.0.9+10
 *   Tue Aug 11 2020 Ankit Jain <[email protected]> 11.0.8-2

diff --git a/support/pullpublishrpms/xrpmfilelist-x86_64 b/support/pullpublishrpms/xrpmfilelist-x86_64
@@ -48,3 +48,5 @@ x86_64/xtrans-1.3.5-1.x86_64.rpm
 x86_64/xtrans-devel-1.3.5-1.x86_64.rpm
 x86_64/libXrandr-1.4.2-1.ph3.x86_64.rpm
 x86_64/libXrandr-devel-1.4.2-1.ph3.x86_64.rpm
+x86_64/openjdk10-1.10.0.23-7.ph4.x86_64.rpm
+x86_64/openjre10-1.10.0.23-7.ph4.x86_64.rpm
diff --git a/...S/openjdk11/generate_source_tarball_11.sh → ...ipts/generate_source_tarball_openjdk11.sh b/...S/openjdk11/generate_source_tarball_11.sh → ...ipts/generate_source_tarball_openjdk11.sh