From 30e7aa1947eaec5fd027489dd6d494efbecc83e30f10e2baebd7b25c5b393232 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Sat, 29 Oct 2022 11:03:42 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:Factory/java-17-openj9?expand=0&rev=22

---
 04a55b45b3a0d75813335fda0fb8703819690ee7.zip |  3 ---
 32d2c409a3325231f58eed81de0f0f1a229b43d6.zip |  3 +++
 85a21674fdf30403b75c3000a4dc10605ca52ba2.zip |  3 +++
 b58aa2708c095efadf522f67aaef9f7de2a7cbc7.zip |  3 ---
 d680e266ef43d1c2e239c7d2fd49e6f9a11992ed.zip |  3 ---
 e04a7f6c1c365a6b375deb5f641c72309b170b95.zip |  3 +++
 java-17-openj9.spec                          | 24 ++++++++------------
 7 files changed, 18 insertions(+), 24 deletions(-)
 delete mode 100644 04a55b45b3a0d75813335fda0fb8703819690ee7.zip
 create mode 100644 32d2c409a3325231f58eed81de0f0f1a229b43d6.zip
 create mode 100644 85a21674fdf30403b75c3000a4dc10605ca52ba2.zip
 delete mode 100644 b58aa2708c095efadf522f67aaef9f7de2a7cbc7.zip
 delete mode 100644 d680e266ef43d1c2e239c7d2fd49e6f9a11992ed.zip
 create mode 100644 e04a7f6c1c365a6b375deb5f641c72309b170b95.zip

diff --git a/04a55b45b3a0d75813335fda0fb8703819690ee7.zip b/04a55b45b3a0d75813335fda0fb8703819690ee7.zip
deleted file mode 100644
index 908fe20..0000000
--- a/04a55b45b3a0d75813335fda0fb8703819690ee7.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:726d2b76b131e9fd9bb65e44614a471bad187d6a1bf6177ffe0c875019b67dc6
-size 28189423
diff --git a/32d2c409a3325231f58eed81de0f0f1a229b43d6.zip b/32d2c409a3325231f58eed81de0f0f1a229b43d6.zip
new file mode 100644
index 0000000..c215981
--- /dev/null
+++ b/32d2c409a3325231f58eed81de0f0f1a229b43d6.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4a089e441b3cc207e6e992a100922c522ed55c47eda7c2122e18dad256ed5612
+size 167396904
diff --git a/85a21674fdf30403b75c3000a4dc10605ca52ba2.zip b/85a21674fdf30403b75c3000a4dc10605ca52ba2.zip
new file mode 100644
index 0000000..0de15ef
--- /dev/null
+++ b/85a21674fdf30403b75c3000a4dc10605ca52ba2.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b3bcb04a5ee136b77085bf2b2b261ff1305db9f8ee09399b22de4409cac0831e
+size 11014255
diff --git a/b58aa2708c095efadf522f67aaef9f7de2a7cbc7.zip b/b58aa2708c095efadf522f67aaef9f7de2a7cbc7.zip
deleted file mode 100644
index b9bae04..0000000
--- a/b58aa2708c095efadf522f67aaef9f7de2a7cbc7.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3acea855f140147e125035a00f9d30c31dcde4f65acda5b04828b02fad7b8c84
-size 10979425
diff --git a/d680e266ef43d1c2e239c7d2fd49e6f9a11992ed.zip b/d680e266ef43d1c2e239c7d2fd49e6f9a11992ed.zip
deleted file mode 100644
index b7ccef8..0000000
--- a/d680e266ef43d1c2e239c7d2fd49e6f9a11992ed.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b055c08f644e27d3a138df87d052c6860c444ebfe3eb08be516d47a20edf2de
-size 167015023
diff --git a/e04a7f6c1c365a6b375deb5f641c72309b170b95.zip b/e04a7f6c1c365a6b375deb5f641c72309b170b95.zip
new file mode 100644
index 0000000..778b146
--- /dev/null
+++ b/e04a7f6c1c365a6b375deb5f641c72309b170b95.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1fe0a7b307f4e3b303832b248a86b059860037dee8e3889f64f3a63f2e897646
+size 28317691
diff --git a/java-17-openj9.spec b/java-17-openj9.spec
index a348880..b9b1693 100644
--- a/java-17-openj9.spec
+++ b/java-17-openj9.spec
@@ -29,19 +29,18 @@
 # Standard JPackage naming and versioning defines.
 %global featurever      17
 %global interimver      0
-%global updatever       4
-%global datever         2022-07-19
+%global updatever       5
 %global buildver        8
 %global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk17/archive
-%global root_revision   d680e266ef43d1c2e239c7d2fd49e6f9a11992ed
-%global root_branch     v0.33.0-release
+%global root_revision   32d2c409a3325231f58eed81de0f0f1a229b43d6
+%global root_branch     v0.35.0-release
 %global omr_repository  https://github.com/eclipse/openj9-omr/archive
-%global omr_revision    b58aa2708c095efadf522f67aaef9f7de2a7cbc7
-%global omr_branch      v0.33.0-release
+%global omr_revision    85a21674fdf30403b75c3000a4dc10605ca52ba2
+%global omr_branch      v0.35.0-release
 %global openj9_repository https://github.com/eclipse/openj9/archive
-%global openj9_revision 04a55b45b3a0d75813335fda0fb8703819690ee7
-%global openj9_branch   v0.33.0-release
-%global openj9_tag      openj9-0.33.0
+%global openj9_revision e04a7f6c1c365a6b375deb5f641c72309b170b95
+%global openj9_branch   v0.35.0-release
+%global openj9_tag      openj9-0.35.0
 %global java_atk_wrapper_version 0.33.2
 # priority must be 6 digits in total
 %if 0%{?suse_version} > 1500 || 0%{?java_bootstrap}
@@ -444,12 +443,6 @@ bash configure \
     CC=gcc-7 \
     NM=gcc-nm-7 \
 %endif
-    --with-version-feature=%{featurever} \
-    --with-version-interim=%{interimver} \
-    --with-version-update=%{updatever} \
-    --with-version-patch=%{?patchver:%{patchver}}%{!?patchver:0} \
-    --with-version-date=%{datever} \
-    --with-version-build=%{buildver} \
     --with-version-pre="" \
     --with-version-opt="suse-%{release}-%{_arch}" \
     --disable-warnings-as-errors \
@@ -927,6 +920,7 @@ fi
 
 %config(noreplace) %{_jvmdir}/%{sdkdir}/lib/security/blocked.certs
 %config(noreplace) %{_jvmdir}/%{sdkdir}/lib/security/nss.cfg
+%config(noreplace) %{_jvmdir}/%{sdkdir}/lib/security/nss.fips.cfg
 %{_jvmdir}/%{sdkdir}/lib/security/default.policy
 %{_jvmdir}/%{sdkdir}/lib/security/public_suffix_list.dat