Updated to modern BRs

hsqldb.spec

@@ -2,7 +2,7 @@
 
 Name:           hsqldb
 Version:        2.3.1
-Release:        2
+Release:        3
 Epoch:          1
 Summary:        HyperSQL Database Engine
 
@@ -34,16 +34,13 @@ BuildRequires:  ant
 BuildRequires:  jpackage-utils >= 0:1.5
 BuildRequires:  junit
 BuildRequires:  systemd-units
-#BuildRequires:  tomcat-servlet-3.0-api
-BuildRequires:  servlet25
+BuildRequires:  servlet6
 
 Requires:       java
-Requires:       servlet25
-#Requires:       tomcat-servlet-3.0-api
+Requires:       servlet6
 Requires(pre):  shadow-utils
 Requires(post): systemd
 Requires(post): systemd-units
-Requires(preun):  initscripts
 Requires(preun):  systemd-units
 Requires(postun): systemd-units
 
@@ -112,11 +109,11 @@ sed -i -e 's/doc-src/doc/g' build/build.xml
 
 %build
 export CLASSPATH=$(build-classpath \
-servlet \
+tomcat-servlet-api \
 junit)
 pushd build
 export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
-ant hsqldb javadoc
+ant hsqldb 
 popd
 
 %install
@@ -162,7 +159,7 @@ pushd %{buildroot}%{_localstatedir}/lib/%{name}/lib
     # build-classpath can not be used as the jar is not
     # yet present during the build
     ln -s %{_javadir}/hsqldb.jar hsqldb.jar
-    ln -s $(build-classpath servlet) servlet.jar
+    ln -s $(build-classpath tomcat-servlet-api) servlet.jar
 popd
 
 %preun