SPECS: jakarta-servletapi5.spec - unify java package - provide ver...

[glen]

Author: glen                         Date: Thu Dec 13 23:47:08 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unify java package
- provide versioned servlet
- rel 3

---- Files affected:
SPECS:
   jakarta-servletapi5.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/jakarta-servletapi5.spec
diff -u SPECS/jakarta-servletapi5.spec:1.7 SPECS/jakarta-servletapi5.spec:1.8
--- SPECS/jakarta-servletapi5.spec:1.7	Sat Dec  8 00:28:23 2007
+++ SPECS/jakarta-servletapi5.spec	Fri Dec 14 00:47:02 2007
@@ -4,7 +4,7 @@
 Summary(pl.UTF-8):	Klasy z implementacją Java Servlet i JSP
 Name:		jakarta-servletapi5
 Version:	5.5.23
-Release:	2
+Release:	3
 License:	Apache
 Group:		Development/Languages/Java
 Source0:	http://www.apache.org/dist/tomcat/tomcat-5/v%{version}/src/apache-tomcat-%{version}-src.tar.gz
@@ -16,9 +16,10 @@
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
+Requires:	jpackage-utils
 Provides:	jakarta-servletapi = %{version}
 Provides:	jsp
-Provides:	servlet
+Provides:	servlet = %{version}
 Provides:	servlet24
 Provides:	servlet5
 Provides:	servletapi5
@@ -54,13 +55,12 @@
 %patch0 -p1
 
 %build
-cd apache-tomcat-%{version}-src/servletapi/jsr154
-%ant dist \
+cd apache-tomcat-%{version}-src/servletapi
+%ant -f jsr154/build.xml dist \
 	-Dservletapi.build=build \
 	-Dservletapi.dist=dist
 
-cd ../jsr152
-%ant dist \
+%ant -f jsr152/build.xml dist \
 	-Dservletapi.build=build \
 	-Dservletapi.dist=dist
 
@@ -71,13 +71,13 @@
 # JSP 2.0 and Servlet 2.4 classes
 install jsr152/dist/lib/jsp-api.jar $RPM_BUILD_ROOT%{_javadir}/jsp-api-%{version}.jar
 install jsr154/dist/lib/servlet-api.jar $RPM_BUILD_ROOT%{_javadir}/servlet-api-%{version}.jar
-ln -sf servlet-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/servlet-api.jar
-ln -sf jsp-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/jsp-api.jar
+ln -s servlet-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/servlet-api.jar
+ln -s servlet-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/servlet.jar
+ln -s jsp-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/jsp-api.jar
 
 # not sure who expects what from which class
 # servletapi4 contained both servlet-api and jsp-api classes in it's jar
-ln -sf servlet-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/servlet.jar
-ln -sf servlet-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/servletapi5.jar
+ln -s servlet-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/servletapi5.jar
 
 # javadoc
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -106,6 +106,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2007-12-13 23:47:02  glen
+- unify java package
+- provide versioned servlet
+- rel 3
+
 Revision 1.7  2007-12-07 23:28:23  glen
 - save old changes
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/jakarta-servletapi5.spec?r1=1.7&r2=1.8&f=u