diff --git a/resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb b/resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb index 8df454c7..653fb6d9 100755 --- a/resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb +++ b/resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb @@ -182,16 +182,20 @@ options.systemd_el = 1 elsif options.operating_system == :el && options.os_version >= 7 # systemd el if ! options.is_pe + # https://bugzilla.redhat.com/show_bug.cgi?id=2224427 fpm_opts << "--depends tzdata-java" case options.platform_version when 8 # rpm on Redhat 7 may not support OR dependencies if options.os_version == 7 - options.java = 'java-11-openjdk-headless' + options.java = 'jre-11-headless' + options.java_bin = '/usr/lib/jvm/jre-11/bin/java' elsif options.os_version == 8 - options.java = '(java-17-openjdk-headless or java-11-openjdk-headless)' + options.java = '(jre-17-headless or jre-11-headless)' + # TODO: which bin to use? /usr/bin/java may be anything elsif options.os_version == 9 - options.java = 'java-17-openjdk-headless' + options.java = 'jre-17-headless' + options.java_bin = '/usr/lib/jvm/jre-17/bin/java' else fail "Unrecognized el os version #{options.os_version}" end