[gdata-java] Build against servlet25.

[Alexander Kurtakov]

commit 9bc5768f75f445769ef9f2b19eac87b0b304e9d6
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Mar 16 16:18:27 2011 +0200

    Build against servlet25.

 gdata-java.spec |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/gdata-java.spec b/gdata-java.spec
index dc43b64..40811a0 100644
--- a/gdata-java.spec
+++ b/gdata-java.spec
@@ -1,20 +1,19 @@
-%define genericname gdata
+%global genericname gdata
 
 Name:           %{genericname}-java
 Version:        1.41.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Client libraries to write Google Data API client applications in Java
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://code.google.com/apis/gdata/clientlibs.html
 Source0:        http://gdata-java-client.googlecode.com/files/%{genericname}-src.java-%{version}.zip
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     java-devel >= 1:1.6.0
 BuildRequires:     jpackage-utils
 BuildRequires:     ant
-BuildRequires:     classpathx-jaf classpathx-mail tomcat5-servlet-2.4-api
+BuildRequires:     javamail servlet25
 BuildRequires:     guava jsr-305
 Requires:          java >= 1:1.6.0
 Requires:          jpackage-utils
@@ -46,8 +45,8 @@ rm -rf lib/* gdata/java/deps/* classes doc
 
 properties=build-src/build.properties
 for jars in \
-  "servlet servletapi5" \
-  "mail javamail" \
+  "servlet servlet" \
+  "mail javamail/mail" \
   "activation activation" \
   "guava jsr-305"
 do
@@ -76,7 +75,6 @@ popd
 #jars
 pushd java
 pushd lib
-rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}/%{genericname}
 install -m644 *.jar $RPM_BUILD_ROOT%{_javadir}/%{genericname}
 for i in `ls *.jar`; do
@@ -91,10 +89,6 @@ cp -rp doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{genericname}
 popd
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
 %defattr(-,root,root,-)
 %doc COPYING
@@ -108,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Mar 16 2011 Alexander Kurtakov <akurtako at redhat.com> 1.41.2-3
+- Build against servlet25.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.41.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild