SPECS: jakarta-servletapi5.spec - save old changes

glen glen at pld-linux.org
Sat Dec 8 00:28:28 CET 2007


Author: glen                         Date: Fri Dec  7 23:28:28 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- save old changes

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

---- Diffs:

================================================================
Index: SPECS/jakarta-servletapi5.spec
diff -u SPECS/jakarta-servletapi5.spec:1.6 SPECS/jakarta-servletapi5.spec:1.7
--- SPECS/jakarta-servletapi5.spec:1.6	Fri Dec  7 21:00:25 2007
+++ SPECS/jakarta-servletapi5.spec	Sat Dec  8 00:28:23 2007
@@ -22,6 +22,7 @@
 Provides:	servlet24
 Provides:	servlet5
 Provides:	servletapi5
+Obsoletes:	jakarta-servletapi < 4
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -67,8 +68,14 @@
 rm -rf $RPM_BUILD_ROOT
 cd apache-tomcat-%{version}-src/servletapi
 install -d $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir}/%{name}-%{version}}
+# 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
+
+# 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
 
@@ -99,6 +106,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2007-12-07 23:28:23  glen
+- save old changes
+
 Revision 1.6  2007-12-07 20:00:25  glen
 - adapter
 
================================================================

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



More information about the pld-cvs-commit mailing list