[jamonapi] use servlet 3.1 api and el 3.0 api

[gil]

commit 6a67144b186767c97d152a84ae10f98408bad19d
Author: gil <puntogil at libero.it>
Date:   Thu Mar 5 13:35:22 2015 +0100

    use servlet 3.1 api and el 3.0 api

 jamonapi.spec | 44 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)
---
diff --git a/jamonapi.spec b/jamonapi.spec
index 25a478a..6dd6487 100644
--- a/jamonapi.spec
+++ b/jamonapi.spec
@@ -2,7 +2,7 @@
 
 Name:          jamonapi
 Version:       2.74
-Release:       5%{?dist}
+Release:       6%{?dist}
 Summary:       A Java monitoring API
 License:       BSD
 URL:           http://jamonapi.sourceforge.net/
@@ -23,22 +23,19 @@ Patch2:        %{name}-log4j12.patch
 Patch3:        %{name}-jetty9.patch
 
 BuildRequires: java-devel
-BuildRequires: javapackages-tools
+BuildRequires: javapackages-local
 BuildRequires: ant
 BuildRequires: tomcat-lib
-BuildRequires: tomcat-servlet-3.0-api
-BuildRequires: tomcat-el-2.2-api
+BuildRequires: tomcat-servlet-3.1-api
+BuildRequires: tomcat-el-3.0-api
 BuildRequires: jetty
 BuildRequires: geronimo-interceptor
 BuildRequires: log4j12
 BuildRequires: dos2unix
-Requires:      javapackages-tools
-Requires:      tomcat-lib
-Requires:      tomcat-servlet-3.0-api
-Requires:      tomcat-el-2.2-api
-Requires:      jetty
+
 Requires:      geronimo-interceptor
 Requires:      log4j12
+
 BuildArch:     noarch
 
 %description
@@ -60,6 +57,12 @@ This package contains API documentation for Java monitoring API.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+
+sed -i "s|tomcat-el-2.2-api.jar|tomcat-el-api.jar|" src/ant/build.xml
+sed -i "s|tomcat-servlet-3.0-api.jar|tomcat-servlet-api.jar|" src/ant/build.xml
+
+sed -i 's|target="1.5" source="1.5"|target="1.6" source="1.6"|' src/ant/build.xml
+
 mkdir dist
 mkdir lib
 
@@ -83,28 +86,23 @@ popd
 cp -p src/JAMonUsersGuide/JAMonLicense.html .
 
 %install
-
-mkdir -p %{buildroot}%{_javadir}
-install -m 644 dist/%{oname}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-ln -s %{name}.jar %{buildroot}%{_javadir}/%{oname}.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{oname}.pom
-%add_maven_depmap JPP-%{oname}.pom %{oname}.jar
-
-mkdir -p %{buildroot}%{_javadocdir}
-cp -rp src/doc/javadoc %{buildroot}%{_javadocdir}/%{name}
+%mvn_artifact %{SOURCE1} dist/%{oname}-%{version}.jar
+%mvn_file com.jamonapi:jamon %{oname} %{name}
+%mvn_install -J src/doc/javadoc
 
 %files -f .mfiles
 %doc src/JAMonUsersGuide
-%{_javadir}/%{name}.jar
 %license JAMonLicense.html
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %license JAMonLicense.html
-%{_javadocdir}/%{name}
 
 %changelog
+* Thu Mar 05 2015 gil cattaneo <puntogil at libero.it> 2.74-6
+- use servlet 3.1 api and el 3.0 api
+- use javac target/source 1.6
+- use new javapackages macros
+
 * Fri Feb 06 2015 gil cattaneo <puntogil at libero.it> 2.74-5
 - introduce license macro