diff --git a/bsh.spec b/bsh.spec index 2d5312a..7ef5f19 100644 --- a/bsh.spec +++ b/bsh.spec @@ -49,7 +49,7 @@ BuildRequires: ant, bsf, ant-trax, ImageMagick, desktop-file-utils BuildRequires: servlet Requires: java >= 1:1.6.0 Requires: bsf -Requires: jpackage-utils >= 0:1.7.2 +Requires: jpackage-utils >= 0:1.7.5-3.9 URL: http://www.beanshell.org/ Group: Development/Libraries BuildArch: noarch @@ -234,6 +234,7 @@ cat > $RPM_BUILD_ROOT%{_bindir}/$1 << EOF # JPackage Project (http://jpackage.sourceforge.net) # Source functions library +_prefer_jre=true . %{_datadir}/java-utils/java-functions # Source system prefs @@ -330,6 +331,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - Rename -desktop to -utils, move shell scripts and menu entry to it (#417491). - Bring icon cache scriptlets up to date with current guidelines. - Use jline in bsh script for command history support. +- Prefer JRE over SDK when finding JVM to invoke in scripts. * Thu Nov 25 2010 Stanislav Ochotnicky - 0:1.3.0-16 - Fix pom filenames (Resolves rhbz#655791)