[hsqldb] Switch to servlet 3.0 by default.

[Alexander Kurtakov]

commit 8f56e750b9942e2b569c5ba6cac4d7b9767aa30c
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Fri Apr 6 15:06:59 2012 +0300

    Switch to servlet 3.0 by default.

 hsqldb.spec |   24 ++++++------------------
 1 files changed, 6 insertions(+), 18 deletions(-)
---
diff --git a/hsqldb.spec b/hsqldb.spec
index 8ec2151..4471be5 100644
--- a/hsqldb.spec
+++ b/hsqldb.spec
@@ -32,7 +32,7 @@
 
 Name:       hsqldb
 Version:    1.8.1.3
-Release:    6%{?dist}
+Release:    7%{?dist}
 Epoch:      1
 Summary:    HyperSQL Database Engine
 License:    BSD
@@ -47,18 +47,16 @@ Patch0:     %{name}-1.8.0-scripts.patch
 Patch1:     hsqldb-tmp.patch
 Patch2:     %{name}-1.8.0-specify-su-shell.patch
 Patch3:     %{name}-jdbc-4.1.patch
-Requires:   servlet25
+Requires:   tomcat-servlet-3.0-api
 Requires:   java
 Requires(post):   coreutils
 Requires(preun):  coreutils
 Requires(preun): initscripts
 Requires(pre):  shadow-utils
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
 BuildRequires:  ant
 BuildRequires:  junit
 BuildRequires:  jpackage-utils >= 0:1.5
-BuildRequires:  servlet25
+BuildRequires:  tomcat-servlet-3.0-api
 Group:      Applications/Databases
 BuildArch:  noarch
 
@@ -197,16 +195,6 @@ fi
 # This adds the proper /etc/rc*.d links for the script
 /sbin/chkconfig --add %{name}
 
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
 %files
 %defattr(-,root,root,-)
 %doc doc/hsqldb_lic.txt
@@ -224,20 +212,20 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %{_mavenpomdir}/*
 
 %files manual
-%defattr(-,root,root,-)
 %doc %{_docdir}/%{name}-%{version}
 %doc doc/hsqldb_lic.txt
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 %doc doc/hsqldb_lic.txt
 
 %files demo
-%defattr(-,root,root,-)
 %{_datadir}/%{name}
 
 %changelog
+* Fri Apr 6 2012 Alexander Kurtakov <akurtako at redhat.com> 1:1.8.1.3-7
+- Switch to servlet 3.0 by default.
+
 * Thu Mar 08 2012 Tomas Radej <tradej at redhat.com> - 1:1.8.1.3-6
 - Fixed symlink