Author: pawelz Date: Sun Mar 15 19:28:11 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - it provides servletapi 2.4, not 5.5.27. - added with_java_sun bcond - rel 3
---- Files affected: SPECS: java-servletapi5.spec (1.15 -> 1.16) ---- Diffs: ================================================================ Index: SPECS/java-servletapi5.spec diff -u SPECS/java-servletapi5.spec:1.15 SPECS/java-servletapi5.spec:1.16 --- SPECS/java-servletapi5.spec:1.15 Wed Feb 4 22:54:04 2009 +++ SPECS/java-servletapi5.spec Sun Mar 15 20:28:06 2009 @@ -1,14 +1,17 @@ # $Revision$, $Date$ +# TODO: +# - shouldn't it be java-servletapi-2.4 ? # # Conditional build: %bcond_without javadoc # don't build javadoc +%bcond_with java_sun # use java-sun %include /usr/lib/rpm/macros.java Summary: Java servlet and JSP implementation classes Summary(pl.UTF-8): Klasy z implementacją Java Servlet i JSP Name: java-servletapi5 Version: 5.5.27 -Release: 2 +Release: 3 License: Apache Group: Libraries/Java Source0: http://www.apache.org/dist/tomcat/tomcat-5/v%{version}/src/apache-tomcat-%{version}-src.tar.gz @@ -16,13 +19,16 @@ Patch0: jakarta-servletapi5-target.patch URL: http://tomcat.apache.org/ BuildRequires: ant -BuildRequires: java-gcj-compat-devel +%{!?with_java_sun:BuildRequires: java-gcj-compat-devel} +%{?with_java_sun:BuildRequires: java-sun} BuildRequires: jpackage-utils BuildRequires: rpm-javaprov BuildRequires: rpmbuild(macros) >= 1.300 Requires: jpackage-utils Provides: jakarta-servletapi5 -Provides: jsp +Provides: jsp = 2.0 +Provides: servlet = 2.4 +# for compatibility with some packages. But it is not true: Provides: servlet = %{version} Provides: servlet24 Provides: servlet5 @@ -64,12 +70,12 @@ %build %ant -f jsr154/build.xml dist \ - -Dbuild.compiler=gcj \ + -Dbuild.compiler=extJavac \ -Dservletapi.build=build \ -Dservletapi.dist=dist %ant -f jsr152/build.xml dist \ - -Dbuild.compiler=gcj \ + -Dbuild.compiler=extJavac \ -Dservletapi.build=build \ -Dservletapi.dist=dist @@ -119,6 +125,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.16 2009/03/15 19:28:06 pawelz +- it provides servletapi 2.4, not 5.5.27. +- added with_java_sun bcond +- rel 3 + Revision 1.15 2009/02/04 21:54:04 pawelz - sorted P: - Obsoletes classpathx_servlet ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-servletapi5.spec?r1=1.15&r2=1.16&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
