# HG changeset patch # User Jie Kang # Date 1484664670 18000 # Node ID 7a19d9e8fb9b0267946262f7cc701339fb5ff965 # Parent fdb31d869bf91fde76cb253ab19f7a2491cd6d38 Use /usr/lib/jvm/java for jdk base when building rpm. PR3283 Reviewed-by: jerboaa Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-January/021981.html diff -r fdb31d869bf9 -r 7a19d9e8fb9b distribution/packaging/fedora/thermostat.spec --- a/distribution/packaging/fedora/thermostat.spec Fri Jan 13 12:41:31 2017 -0500 +++ b/distribution/packaging/fedora/thermostat.spec Tue Jan 17 09:51:10 2017 -0500 @@ -113,15 +113,7 @@ # Base path to the JDK which will be used in boot scripts -%if 0%{?fedora} >= 22 - %global jdk_base /etc/alternatives/java_sdk_openjdk -%else - %if 0%{?is_rhel_6} - %global jdk_base /usr/lib/jvm/java-1.7.0-openjdk.x86_64 - %else - %global jdk_base /usr/lib/jvm/java-1.7.0-openjdk - %endif -%endif +%global jdk_base /usr/lib/jvm/java %{?scl:%scl_package thermostat} %{!?scl:%global pkg_name %{name}}