[sslext] use servlet api 3.1

[gil]

commit 25ff008c68ad7fec61fe78d6e577b19e99d17a2e
Author: gil <puntogil at libero.it>
Date:   Wed Mar 4 15:21:02 2015 +0100

    use servlet api 3.1

 sslext.spec | 38 +++++++++++++++-----------------------
 1 file changed, 15 insertions(+), 23 deletions(-)
---
diff --git a/sslext.spec b/sslext.spec
index 786eaa1..aa28a44 100644
--- a/sslext.spec
+++ b/sslext.spec
@@ -26,7 +26,7 @@ Patch2:        %{name}-%{version}-pom.patch
 Patch3:        %{name}-%{version}-javadocs.patch
 
 BuildRequires: java-devel
-BuildRequires: jpackage-utils
+BuildRequires: javapackages-local
 
 BuildRequires: ant
 BuildRequires: apache-commons-beanutils
@@ -37,16 +37,9 @@ BuildRequires: apache-commons-logging
 BuildRequires: apache-commons-validator
 BuildRequires: jakarta-oro
 BuildRequires: struts
-BuildRequires: tomcat-jsp-2.2-api
-BuildRequires: tomcat-servlet-3.0-api
+BuildRequires: tomcat-jsp-2.3-api
+BuildRequires: tomcat-servlet-3.1-api
 
-Requires:      apache-commons-digester
-Requires:      apache-commons-logging
-Requires:      struts
-Requires:      tomcat-servlet-3.0-api
-Requires:      tomcat-jsp-2.2-api
-
-Requires:      jpackage-utils
 BuildArch:     noarch
 
 %description
@@ -64,6 +57,9 @@ This package contains javadoc for %{name}.
 %setup -q
 mkdir -p web/WEB-INF/classes
 %patch0 -p0
+sed -i "s|tomcat-servlet-3.0-api|tomcat-servlet-api|" build.xml
+sed -i "s|tomcat-jsp-2.2-api|tomcat-jsp-api|" build.xml
+sed -i "s|1.5|1.6|" build.xml
 %patch1 -p0
 cp -p %{SOURCE1} pom.xml
 %patch2 -p0
@@ -71,27 +67,23 @@ cp -p %{SOURCE1} pom.xml
 
 %build
 
-export CLASSPATH=$(build-classpath tomcat-jsp-2.2-api tomcat-servlet-3.0-api)
+export CLASSPATH=$(build-classpath tomcat-servlet-api tomcat-jsp-api)
 %ant compile make-jar javadoc
 
 %install
-
-mkdir -p %{buildroot}%{_javadir}
-install -m 644 web/WEB-INF/lib/%{name}.jar %{buildroot}%{_javadir}/
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr docs/* %{buildroot}%{_javadocdir}/%{name}
+%mvn_artifact pom.xml web/WEB-INF/lib/%{name}.jar
+%mvn_file %{name}:%{name} %{name}
+%mvn_install -J docs
 
 %files -f .mfiles
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 
 %changelog
+* Wed Mar 04 2015 gil cattaneo <puntogil at libero.it> 1.2-8
+- use servlet api 3.1
+- use new javapackages macros
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild