From b7d15928c6333f95d75fa06e9ba6511f619344b7 Mon Sep 17 00:00:00 2001
From: gbenson <gbenson@fedoraproject.org>
Date: Thu, 2 Jun 2005 16:02:07 +0000
Subject: [PATCH] Port to Fedora

---
 .cvsignore      |  3 +++
 bsf-javac.patch | 11 +++++++++++
 bsf.spec        | 20 +++++++++++---------
 3 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 bsf-javac.patch

diff --git a/.cvsignore b/.cvsignore
index 922bc4e..fed8510 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,4 @@
 bsf-src-2.3.0.tar.gz
+bsf-2.3.0
+noarch
+*.src.rpm
diff --git a/bsf-javac.patch b/bsf-javac.patch
new file mode 100644
index 0000000..14a255e
--- /dev/null
+++ b/bsf-javac.patch
@@ -0,0 +1,11 @@
+--- bsf-2.3.0/src/bsf/src/org/apache/bsf/util/JavaUtils.java~	2002-11-13 06:28:54.000000000 +0000
++++ bsf-2.3.0/src/bsf/src/org/apache/bsf/util/JavaUtils.java	2005-06-01 18:11:23.000000000 +0100
+@@ -82,7 +82,7 @@
+   };
+   try
+ 	{
+-	  return new sun.tools.javac.Main(System.err, "javac").compile(args);
++	  return new com.sun.tools.javac.Main().compile(args) == 0;
+ 	}
+   catch (Throwable th)
+ 	{
diff --git a/bsf.spec b/bsf.spec
index a3aad6b..7d0ee2d 100644
--- a/bsf.spec
+++ b/bsf.spec
@@ -1,6 +1,6 @@
 %define name		bsf
 %define version		2.3.0
-%define release		6jpp_1rh
+%define release		6jpp_0fc
 %define section		free
 
 Name:		%{name}
@@ -11,13 +11,10 @@ Summary:        Bean Scripting Framework
 License:        Apache License
 Url:            http://jakarta.apache.org/bsf/
 Group:          Development/Libraries/Java
-#Vendor:         JPackage Project
-#Distribution:	JPackage
 Source0:        http://jakarta.apache.org/builds/jakarta-%{name}/dev/v%{version}/src/%{name}-src-%{version}.tar.gz
+Patch1:		bsf-javac.patch
 BuildRequires:  ant
-BuildRequires:	jython
-BuildRequires:  oldrhino
-BuildRequires:	servlet
+BuildRequires:	servletapi5
 BuildRequires:  xalan-j2
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot
@@ -58,16 +55,16 @@ Javadoc for %{name}.
 %prep
 rm -rf $RPM_BUILD_ROOT
 %setup -q
+%patch1 -p1
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 rmdir $RPM_BUILD_DIR/bsf
 
 %build
 export CLASSPATH=\
-%{_javadir}/oldrhino.jar:\
 %{_javadir}/xalan-j2.jar:\
-%{_javadir}/jython.jar:\
-%{_javadir}/servlet.jar
+%{_javadir}/servletapi5.jar:\
+%{_javadir}/jspapi.jar
 cd src
 ant realclean
 ant compile
@@ -113,6 +110,11 @@ fi
 %ghost %{_javadocdir}/%{name}
 
 %changelog
+* Thu Jun  2 2005 Gary Benson <gbenson@redhat.com>
+- Build without Jython or Rhino for now.
+- Build with servletapi5.
+- Avoid Sun-specific classes.
+
 * Thu Mar  4 2004 Frank Ch. Eigler <fche@redhat.com> 0:2.3.0-6jpp_1rh
 - RH vacuuming