[xmlrpc] Migrate to new tomcat-servlet-api

Stanislav Ochotnicky sochotni at fedoraproject.org
Tue Jun 5 14:07:58 UTC 2012


commit 680ad0ff80ba7dea59079e5a6061b7950185c0e3
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Tue Jun 5 15:54:09 2012 +0200

    Migrate to new tomcat-servlet-api

 xmlrpc.spec |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/xmlrpc.spec b/xmlrpc.spec
index c7c3bde..5517d11 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -30,7 +30,7 @@
 
 Name:       xmlrpc
 Version:    2.0.1
-Release:    11%{?dist}
+Release:    12%{?dist}
 Epoch:      0
 Summary:    Java XML-RPC implementation
 License:    ASL 2.0
@@ -41,14 +41,14 @@ Source0:    http://www.apache.org/dist/ws/xmlrpc/sources/xmlrpc-2.0.1-src.tar.gz
 BuildRequires:  java >= 1:1.6.0
 BuildRequires:  ant
 BuildRequires:  jpackage-utils >= 0:1.6
-BuildRequires:  servlet25
+BuildRequires:  servlet3
 BuildRequires:  junit
 BuildRequires:  jakarta-commons-httpclient
 BuildRequires:  apache-commons-codec
 
 Requires:       java >= 1:1.6.0
 Requires:       jpackage-utils >= 0:1.6
-Requires:       servlet25
+Requires:       servlet3
 Requires:       junit
 Requires:       jakarta-commons-httpclient
 Requires:       apache-commons-codec
@@ -80,7 +80,7 @@ find . -name "*.jar" -exec rm -f {} \;
 
 
 %build
-export CLASSPATH=%(build-classpath commons-httpclient apache-commons-codec tomcat6-servlet-2.5-api junit 2>/dev/null)
+export CLASSPATH=%(build-classpath commons-httpclient apache-commons-codec tomcat-servlet-api junit 2>/dev/null)
 ant -Dbuild.dir=./bin -Dbuild.dest=./bin -Dsrc.dir=./src -Dfinal.name=%{name}-%{version} -Djavadoc.destdir=./docs/apidocs -Dhave.deps=true jar
 ant -Dbuild.dir=./bin -Dbuild.dest=./bin -Dsrc.dir=./src -Dfinal.name=%{name}-%{version} -Djavadoc.destdir=./docs/apidocs -Dhave.deps=true javadocs
 
@@ -98,16 +98,17 @@ cp -pr docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %files
-%defattr(-,root,root,-)
 %doc LICENSE.txt README.txt
 %{_javadir}/*
 
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Jun 05 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:2.0.1-12
+- Migrate to new tomcat-servlet-api
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.0.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list