[hsqldb] - Update to use tomcat6 servlet implementation.

[Alexander Kurtakov]

commit c1be239116036fe8ca9bde3d6b8827bc5b90fbf3
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Oct 6 21:23:20 2010 +0300

    - Update to use tomcat6 servlet implementation.

 hsqldb.spec |   81 +++++++++++++++-------------------------------------------
 1 files changed, 21 insertions(+), 60 deletions(-)
---
diff --git a/hsqldb.spec b/hsqldb.spec
index dd7a418..7ca0755 100644
--- a/hsqldb.spec
+++ b/hsqldb.spec
@@ -28,21 +28,15 @@
 # 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}}}
-
-%define section		devel
-
-%define cvs_version	1_8_0_10
+%global cvs_version	1_8_0_10
 
 Name:		hsqldb
 Version:	1.8.0.10
-Release:	5%{?dist}
+Release:	6%{?dist}
 Epoch:		1
 Summary:	Hsqldb Database Engine
 License:	BSD
-Url:		http://hsqldb.sourceforge.net/
+URL:		http://hsqldb.sourceforge.net/
 #http://downloads.sourceforge.net/hsqldb/hsqldb_1_8_0_9.zip
 Source0:    %{name}_%{cvs_version}.zip
 Source1:    %{name}-1.8.0-standard.cfg
@@ -55,28 +49,20 @@ Patch1:     hsqldb-tmp.patch
 Patch2:     %{name}-1.8.0-specify-su-shell.patch
 Patch3:     %{name}-1.8.0-bitxor-bitor.patch
 Patch4:     %{name}-1.8.0-autoincrement.patch
-Requires:   servletapi5
-Requires(post):   /bin/rm,/bin/ln
-Requires(post):   servletapi5
-Requires(preun): /bin/rm
+Requires:   servlet25
+Requires(post):   coreutils
+Requires(post):   servlet25
+Requires(preun):  coreutils
 Requires(pre):	shadow-utils
 Requires(post): jpackage-utils
 Requires(postun): jpackage-utils
 BuildRequires:	ant
 BuildRequires:	junit
 BuildRequires:	jpackage-utils >= 0:1.5
-BuildRequires:	servletapi5
+BuildRequires:	servlet25
 Group:		Development/Java
-%if ! %{gcj_support}
-Buildarch:	noarch
-%endif
-Buildroot:	%{_tmppath}/%{name}-%{version}-buildroot
-
-%if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
-%endif
+BuildArch:	noarch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 %description
 HSQLdb is a relational database engine written in JavaTM , with a JDBC
@@ -150,7 +136,7 @@ jsse/jsse \
 jsse/jnet \
 jsse/jcert \
 jdbc-stdext \
-servletapi5 \
+servlet \
 junit)
 pushd build
 ant jar javadoc
@@ -187,6 +173,7 @@ install -m 644 demo/*.html 	$RPM_BUILD_ROOT%{_datadir}/%{name}/demo
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -r doc/src/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 rm -rf doc/src
 # manual
 install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -197,10 +184,6 @@ cp index.html $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 %add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -216,25 +199,13 @@ rm -f %{_localstatedir}/lib/%{name}/lib/hsqldb.jar
 rm -f %{_localstatedir}/lib/%{name}/lib/servlet.jar
 (cd %{_localstatedir}/lib/%{name}/lib
     ln -s $(build-classpath hsqldb) hsqldb.jar
-    ln -s $(build-classpath servletapi5) servlet.jar
+    ln -s $(build-classpath servlet) servlet.jar
 )
 
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %preun
 if [ "$1" = "0" ]; then
@@ -244,17 +215,8 @@ if [ "$1" = "0" ]; then
     #%{_sbindir}/groupdel %{name} >> /dev/null 2>&1 || :
 fi
 
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%preun javadoc
-if [ "$1" = "0" ]; then
-    rm -f %{_javadocdir}/%{name}
-fi
-
 %files
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/hsqldb_lic.txt
 %{_javadir}/*
@@ -270,23 +232,23 @@ fi
 %{_mavendepmapfragdir}/*
 %{_mavenpomdir}/*
 
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
-
 %files manual
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %doc %{_docdir}/%{name}-%{version}
 
 %files javadoc
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
 
 %files demo
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %{_datadir}/%{name}
 
 %changelog
+* Wed Oct 6 2010 Alexander Kurtakov <akurtako at redhat.com> 1:1.8.0.10-6
+- Update to use tomcat6 servlet implementation.
+
 * Mon Jan 11 2010 Mary Ellen Foster <mefoster at gmail.com> - 1.8.0.10-5
 - Add maven2 pom and metadata
 
@@ -445,4 +407,3 @@ fi
 * Fri Nov 09 2001 Christian Zoffoli <czoffoli at littlepenguin.org> 1.43-1jpp
 - first release
 - linuxization patch (doc + script)
-