[hessian] use servlet api 3.1

[gil]

commit c981054f1057706694ad9731164bdf42e001eda6
Author: gil <puntogil at libero.it>
Date:   Wed Mar 4 16:08:05 2015 +0100

    use servlet api 3.1

 hessian-build.xml |  2 +-
 hessian.spec      | 55 +++++++++++++++++++++++--------------------------------
 2 files changed, 24 insertions(+), 33 deletions(-)
---
diff --git a/hessian-build.xml b/hessian-build.xml
index 5d525e6..93e0d90 100644
--- a/hessian-build.xml
+++ b/hessian-build.xml
@@ -9,7 +9,7 @@
 
   <path id="project.classpath">
     <pathelement location="${classes.dir}"/>
-    <pathelement location="${lib.dir}/tomcat-servlet-3.0-api.jar"/>
+    <pathelement location="${lib.dir}/tomcat-servlet-api.jar"/>
   </path>
 
   <target name="compile">
diff --git a/hessian.spec b/hessian.spec
index 3aec39d..aaed74e 100644
--- a/hessian.spec
+++ b/hessian.spec
@@ -1,21 +1,18 @@
-Summary:        Java implementation of a binary protocol for web services 
-Name:           hessian
-Version:        4.0.7
-Release:        9%{?dist}
-Epoch:          0
-License:        ASL 1.1
-URL:            http://hessian.caucho.com/
-Source0:        http://caucho.com/download/hessian-4.0.7-src.jar
-Source1:        %{name}-build.xml
-Source2:        http://repo1.maven.org/maven2/com/caucho/hessian/4.0.7/hessian-4.0.7.pom
-Requires:       jpackage-utils >= 0:1.6
-BuildRequires:  jpackage-utils >= 0:1.6
-BuildRequires:  ant >= 0:1.6
-BuildRequires:  tomcat-servlet-3.0-api
-Requires:       jpackage-utils
-Requires:       tomcat-servlet-3.0-api
-
-BuildArch:      noarch
+Summary:       Java implementation of a binary protocol for web services 
+Name:          hessian
+Version:       4.0.7
+Release:       10%{?dist}
+Epoch:         0
+License:       ASL 1.1
+URL:           http://hessian.caucho.com/
+Source0:       http://caucho.com/download/hessian-4.0.7-src.jar
+Source1:       %{name}-build.xml
+Source2:       http://repo1.maven.org/maven2/com/caucho/hessian/4.0.7/hessian-4.0.7.pom
+BuildRequires: javapackages-local
+BuildRequires: ant >= 0:1.6
+BuildRequires: tomcat-servlet-3.1-api
+
+BuildArch:     noarch
 
 %description
 This is the Java implementation of Caucho's Hession binary transport
@@ -36,27 +33,21 @@ ant jar
 ant javadoc 
 
 %install
-# jars
-mkdir -p %{buildroot}%{_javadir}
-cp -p %{name}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-# pom
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
-
-# javadoc
-mkdir -p %{buildroot}%{_javadocdir}
-cp -rp doc/api %{buildroot}%{_javadocdir}/%{name}
+%mvn_artifact %{SOURCE2} web/WEB-INF/lib/%{name}.jar
+%mvn_file com.caucho:%{name} %{name}
+%mvn_install -J doc/api
 
 %files -f .mfiles
 %license apache.license
 
-%files javadoc
-%{_javadocdir}/*
+%files javadoc -f .mfiles-javadoc
 %license apache.license
 
 %changelog
+* Wed Mar 04 2015 gil cattaneo <puntogil at libero.it> 0:4.0.7-10
+- use servlet api 3.1
+- use new javapackages macros
+
 * Thu Feb 05 2015 gil cattaneo <puntogil at libero.it> 0:4.0.7-9
 - introduce license macro