diff --git a/_attribute b/_attribute
index 397ab13..fe64735 100644
--- a/_attribute
+++ b/_attribute
@@ -39,7 +39,7 @@
boo#1138401: '20190726'
boo#1138417: '20190703'
boo#1139857: '20190730'
- boo#1140040: '20200122'
+ boo#1140040: '20200123'
boo#1140249: '20190709'
boo#1141597: '20190801'
boo#1141848: '20190909'
@@ -257,7 +257,7 @@ bad-rpmlint-entries = suse-dbus-unauthorized-service suse-pam-unauthorized-modul
s/openSUSE-/openSUSE-Staging:$LETTER-/
- 20200123
+ 20200124
arch: x86_64
diff --git a/_config b/_config
index 45a3fbb..bc61329 100644
--- a/_config
+++ b/_config
@@ -1014,19 +1014,33 @@ Macros:
# END RUST STUFF
# Default to Java 11
-Prefer: java-11-openjdk java-11-openjdk-devel java-11-openjdk-javadoc java-11-openjdk-headless
-# Fall back to Java 10, if there was no java 11 option
-Prefer: java-10-openjdk java-10-openjdk-devel java-10-openjdk-javadoc java-10-openjdk-headless
-# Fall back to Java 9, if there was no java 10 option
-Prefer: java-9-openjdk java-9-openjdk-devel java-9-openjdk-javadoc java-9-openjdk-headless
-# Prefer java 8 if java 9 was no option
-Prefer: java-1_8_0-openjdk java-1_8_0-openjdk-devel java-1_8_0-openjdk-javadoc java-1_8_0-openjdk-headless
-# And then fall back to java 7 if needed
-Prefer: java-1_7_0-openjdk java-1_7_0-openjdk-devel java-1_7_0-openjdk-javadoc java-1_7_0-openjdk-headless
-# And then fall back to java 7 bootstrap if needed
-Prefer: java-1_7_0-bootstrap java-1_7_0-bootstrap-devel java-1_7_0-bootstrap-javadoc java-1_7_0-bootstrap-headless
-Prefer: -java-12-openjdk java-12-openjdk-devel java-12-openjdk-javadoc java-12-openjdk-headless
-Substitute: java2-devel-packages java-devel
+Prefer: java-11-openjdk-devel java-11-openjdk java-11-openjdk-headless java-11-openjdk-javadoc
+%ifarch s390x
+Prefer: java-1_8_0-openj9-devel java-1_8_0-openj9 java-1_8_0-openj9-headless
+%endif
+Prefer: java-1_8_0-openjdk-devel java-1_8_0-openjdk java-1_8_0-openjdk-headless
+Prefer: java-13-openjdk-devel java-13-openjdk java-13-openjdk-headless
+Prefer: java-12-openjdk-devel java-12-openjdk java-12-openjdk-headless
+Prefer: java-10-openjdk-devel java-10-openjdk java-10-openjdk-headless
+Prefer: java-9-openjdk-devel java-9-openjdk java-9-openjdk-headless
+Prefer: java-1_7_0-openjdk-devel java-1_7_0-openjdk java-1_7_0-openjdk-headless
+Prefer: java-1_7_0-bootstrap-devel java-1_7_0-bootstrap java-1_7_0-bootstrap-headless
+Prefer: java-1_6_0-openjdk-devel java-1_6_0-openjdk java-1_6_0-openjdk-headless
+Prefer: java-1_5_0-gcj-compat-devel java-1_5_0-gcj-compat
+
+#Prefer: java-11-openjdk java-11-openjdk-devel java-11-openjdk-javadoc java-11-openjdk-headless
+## Fall back to Java 10, if there was no java 11 option
+#Prefer: java-10-openjdk java-10-openjdk-devel java-10-openjdk-javadoc java-10-openjdk-headless
+## Fall back to Java 9, if there was no java 10 option
+#Prefer: java-9-openjdk java-9-openjdk-devel java-9-openjdk-javadoc java-9-openjdk-headless
+## Prefer java 8 if java 9 was no option
+#Prefer: java-1_8_0-openjdk java-1_8_0-openjdk-devel java-1_8_0-openjdk-javadoc java-1_8_0-openjdk-headless
+## And then fall back to java 7 if needed
+#Prefer: java-1_7_0-openjdk java-1_7_0-openjdk-devel java-1_7_0-openjdk-javadoc java-1_7_0-openjdk-headless
+## And then fall back to java 7 bootstrap if needed
+#Prefer: java-1_7_0-bootstrap java-1_7_0-bootstrap-devel java-1_7_0-bootstrap-javadoc java-1_7_0-bootstrap-headless
+#Prefer: -java-12-openjdk java-12-openjdk-devel java-12-openjdk-javadoc java-12-openjdk-headless
+#Substitute: java2-devel-packages java-devel
%ifarch x86_64 ppc64 s390x sparc64
Substitute: glibc-devel-32bit glibc-devel-32bit glibc-32bit
diff --git a/_staging_workflow b/_staging_workflow
index 246df36..f8dd71a 100644
--- a/_staging_workflow
+++ b/_staging_workflow
@@ -40,41 +40,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+