From c82432074f74a8bbada51f38ec3285dd75026969 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Wed, 27 Jan 2021 15:09:21 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/bsh.git#85bc37d00ed47974db0b1edfbde0359a3c4ab27f --- bsh.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/bsh.spec b/bsh.spec index 11a112b..c37c092 100644 --- a/bsh.spec +++ b/bsh.spec @@ -29,11 +29,15 @@ # %global reltag b6 +%if 0%{?rhel} >= 8 +%bcond_with desktop +%else %bcond_without desktop +%endif Name: bsh Version: 2.0 -Release: 20.%{reltag}%{?dist} +Release: 22.%{reltag}%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ @@ -178,6 +182,12 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Wed Jan 27 2021 Tomas Popela - 0:2.0-22.b6 +- Don't build the desktop support on RHEL 8+ as ImageMagick isn't available there. + +* Tue Jan 26 2021 Fedora Release Engineering - 0:2.0-21.b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Dec 14 2020 Jerry James - 0:2.0-20.b6 - Change jline Requires to jline2