From 0d3c2e99ebc04b14c7dd5d3200589444bacaf10e Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Sep 23 2019 11:08:41 +0000
Subject: Revert "Remove dependency on bsf"


This reverts commit 67102c25bab6570d9e0a818c74ad98cd7baa366b.

---

diff --git a/0001-Exclude-bsf-adapter.patch b/0001-Exclude-bsf-adapter.patch
deleted file mode 100644
index 8d16299..0000000
--- a/0001-Exclude-bsf-adapter.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From beac0b1f79cbd710c91b6b6e7c3adaf840b77d1b Mon Sep 17 00:00:00 2001
-From: Marian Koncek <mkoncek@redhat.com>
-Date: Mon, 23 Sep 2019 12:04:03 +0200
-Subject: [PATCH] Exclude bsf adapter
-
----
- build.xml | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index 4f400dc..9e2079a 100644
---- a/build.xml
-+++ b/build.xml
-@@ -56,10 +56,9 @@
- 		value="bsh/JThis.java,bsh/classpath/*,bsh/util/*,bsh/reflect/*,bsh/ExternalNameSpace.java"/>
- 	-->
- 
--	<!-- Uncomment to build without making the BSF adapter 
-+	<!-- Uncomment to build without making the BSF adapter -->
- 	<property name="exclude-bsf" 
- 		value="bsh/util/BeanShellBSFEngine.java,TestBshBSF.java"/>
--	-->
- 
- 	<!-- Uncomment to build without making the javax.script (JSR223) adapter 
- 	<property name="exclude-engine" value="bsh/engine/**"/>
-@@ -165,7 +164,7 @@
- 		<!--compiler="${build-compiler}"-->
- 		<!--echo>Debug ON!</echo>-->
- 		<javac
--		srcdir="${src-dir}:${test-src-dir}:${bsf-src-dir}:${engine-src-dir}:${classgen-src-dir}"
-+		srcdir="${src-dir}:${test-src-dir}:${engine-src-dir}:${classgen-src-dir}"
- 			destdir="${build-dir}"
- 			deprecation="${deprecation}"
- 			optimize="on"
--- 
-2.21.0
-
diff --git a/bsh.spec b/bsh.spec
index 8b352b8..3faacf0 100644
--- a/bsh.spec
+++ b/bsh.spec
@@ -48,15 +48,15 @@ Source1:        %{name}-desktop.desktop
 # Remove code marked as SUN PROPRIETARY/CONFIDENTAIL
 Source2:        generate-tarball.sh
 
-Patch1:         0001-Exclude-bsf-adapter.patch
-
 BuildRequires:  javapackages-local
 BuildRequires:  ant
+BuildRequires:  bsf
 BuildRequires:  junit
 BuildRequires:  javacc
 BuildRequires:  glassfish-servlet-api
 
 Requires:       java-headless
+Requires:       bsf
 Requires:       jline
 # Explicit javapackages-tools requires since scripts use
 # /usr/share/java-utils/java-functions
@@ -104,19 +104,15 @@ This package provides %{summary}.
 %prep
 %setup -q -n beanshell-%{upstream_version}
 
-# Drop dependency on bsf
-%patch1 -p1
-rm -rf bsf
-
 sed -i 's,org.apache.xalan.xslt.extensions.Redirect,http://xml.apache.org/xalan/redirect,' docs/manual/xsl/*.xsl
 
-%mvn_alias :bsh bsh:bsh org.beanshell:bsh
+%mvn_alias :bsh bsh:bsh bsh:bsh-bsf org.beanshell:bsh
 
 %mvn_file : %{name}
 
 %build
 mkdir lib
-build-jar-repository lib javacc junit glassfish-servlet-api
+build-jar-repository lib bsf javacc junit glassfish-servlet-api
 
 ant test dist