From 17093b0f948e2d6095591c88b7e3b9442ed1c4c5 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtakov@fedoraproject.org>
Date: Wed, 7 Apr 2010 09:55:18 +0000
Subject: [PATCH] - Drop gcj support. - Build against servlet and jsp apis from
 tomcat6.

---
 bsf.spec | 58 +++++++++++++-------------------------------------------
 1 file changed, 13 insertions(+), 45 deletions(-)

diff --git a/bsf.spec b/bsf.spec
index 0a41170..1dc2fca 100644
--- a/bsf.spec
+++ b/bsf.spec
@@ -28,17 +28,13 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
 Name:           bsf
 Version:        2.4.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 Summary:        Bean Scripting Framework
 License:        ASL 2.0
-Url:            http://jakarta.apache.org/bsf/
+URL:            http://jakarta.apache.org/bsf/
 Group:          Development/Libraries/Java
 #http://jakarta.apache.org/builds/jakarta-%{name}/dev/v%{version}/src/%{name}-src-%{version}.tar.gz
 Source0:        %{name}-src-%{version}.tar.gz
@@ -46,27 +42,19 @@ Patch0:	        build-file.patch
 Patch1:	        build.properties.patch
 BuildRequires:  jpackage-utils >= 1.6
 BuildRequires:  ant
-BuildRequires:  servlet
-BuildRequires:  tomcat5-jsp-2.0-api
+BuildRequires:  servlet6
+BuildRequires:  tomcat6-jsp-2.1-api
 BuildRequires:  xalan-j2
 BuildRequires:  jython
 BuildRequires:  jakarta-commons-logging
 Requires:		jakarta-commons-logging
-Requires:               servletapi5
-Requires:               xalan-j2
-Requires:               tomcat5-jsp-2.0-api
-Requires:               jpackage-utils
-%if ! %{gcj_support}
+Requires:       servlet6
+Requires:       xalan-j2
+Requires:       tomcat6-jsp-2.1-api
+Requires:       jpackage-utils
 BuildArch:      noarch
-%endif
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
 %description
 Bean Scripting Framework (BSF) is a set of Java classes which provides
 scripting language support within Java applications, and access to Java
@@ -111,7 +99,7 @@ find . -name "*.jar" -exec %{__rm} -f {} \;
 
 %build
 [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java 
-export CLASSPATH=$(build-classpath jakarta-commons-logging jython xalan-j2 servlet jspapi)
+export CLASSPATH=$(build-classpath jakarta-commons-logging jython xalan-j2 servlet jsp)
 ant jar 
 %{__rm} -rf bsf/src/org/apache/bsf/engines/java
 ant javadocs
@@ -130,38 +118,14 @@ ln -sf ${jar} ${jar/-%{version}/}; done)
 (cd %{buildroot}%{_javadocdir} && ln -sf %{name}-%{version} %{name})
 ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 %{__rm} -rf %{buildroot}
 
-%post
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%postun
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files
 %defattr(-,root,root)
 %doc LICENSE.txt AUTHORS.txt CHANGES.txt NOTICE.txt README.txt TODO.txt RELEASE-NOTE.txt
 %{_javadir}/*
 
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
-
 %files javadoc
 %defattr(-,root,root)
 %dir %{_javadocdir}/%{name}-%{version}
@@ -169,6 +133,10 @@ fi
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Apr 7 2010 Alexander Kurtakov <akurtako@redhat.com> 0:2.4.0-5
+- Drop gcj support.
+- Build against servlet and jsp apis from tomcat6.
+
 * Mon Jan 11 2010 Andrew Overholt <overholt@redhat.com> 2.4.0-4
 - Fix License (ASL 2.0 and not 1.1) (rhbz#554465).