# HG changeset patch
# User herrick
# Date 1572534421 14400
# Node ID 45bb0bebd36ff9e091555e3f86ac52bedc17fbc4
# Parent  d1602ae3521298b0798a904fca2b9e729a058e9b
8233143 : RPM errors: rpmbuild: no spec files given for build
Submitted-by: asemenyuk
Reviewed-by: aherrick, almatvee

diff -r d1602ae35212 -r 45bb0bebd36f src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java	Thu Oct 31 11:00:26 2019 -0400
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java	Thu Oct 31 11:07:01 2019 -0400
@@ -220,10 +220,41 @@
         return errors;
     }
 
+    /**
+     * Various ways to get rpm arch. Needed to address JDK-8233143. rpmbuild is
+     * mandatory for rpm packaging, try it first. rpm is optional and may not be
+     * available, use as the last resort.
+     */
+    private enum RpmArchReader {
+        Rpmbuild(TOOL_RPMBUILD, "--eval=%{_target_cpu}"),
+        Rpm(TOOL_RPM, "--eval=%{_target_cpu}");
+
+        RpmArchReader(String... cmdline) {
+            this.cmdline = cmdline;
+        }
+
+        String getRpmArch() throws IOException {
+            Executor exec = Executor.of(cmdline).saveOutput(true);
+            if (this == values()[values().length - 1]) {
+                exec.executeExpectSuccess();
+            } else if (exec.execute() != 0) {
+                return null;
+            }
+
+            return exec.getOutput().get(0);
+        }
+
+        private final String[] cmdline;
+    }
+
     private String rpmArch() throws IOException {
         if (rpmArch == null) {
-            rpmArch = Executor.of(TOOL_RPMBUILD, "--eval=%{_target_cpu}").saveOutput(
-                    true).executeExpectSuccess().getOutput().get(0);
+            for (var rpmArchReader : RpmArchReader.values()) {
+                rpmArch = rpmArchReader.getRpmArch();
+                if (rpmArch != null) {
+                    break;
+                }
+            }
         }
         return rpmArch;
     }