packages: java-servletapi5/java-servletapi5.spec - on Th install only versi...

[pawelz]

Author: pawelz                       Date: Wed Sep  9 13:54:20 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- on Th install only versioned jars, to allow it coexist with java-servletapi
  from tomcat6

---- Files affected:
packages/java-servletapi5:
   java-servletapi5.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: packages/java-servletapi5/java-servletapi5.spec
diff -u packages/java-servletapi5/java-servletapi5.spec:1.23 packages/java-servletapi5/java-servletapi5.spec:1.24
--- packages/java-servletapi5/java-servletapi5.spec:1.23	Wed Aug 19 09:06:10 2009
+++ packages/java-servletapi5/java-servletapi5.spec	Wed Sep  9 15:54:15 2009
@@ -90,9 +90,14 @@
 install -d $RPM_BUILD_ROOT%{_javadir}
 cp -a jsr152/dist/lib/jsp-api.jar $RPM_BUILD_ROOT%{_javadir}/jsp-api-%{version}.jar
 cp -a jsr154/dist/lib/servlet-api.jar $RPM_BUILD_ROOT%{_javadir}/servlet-api-%{version}.jar
+
+# Don't install these files in distros where tomcat6 is available, to allow it
+# to coexist with java-servletapi-6.0
+%if "%{pld_release}" == "ti"
 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
+%endif
 
 # not sure who expects what from which class
 # servletapi4 contained both servlet-api and jsp-api classes in it's jar, so we link to api jar (or drop?)
@@ -129,6 +134,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2009/09/09 13:54:15  pawelz
+- on Th install only versioned jars, to allow it coexist with java-servletapi
+  from tomcat6
+
 Revision 1.23  2009/08/19 07:06:10  pawelz
 - up to 5.5.28
 - P: java(JSP) = %{jspapiver}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-servletapi5/java-servletapi5.spec?r1=1.23&r2=1.24&f=u