packages (DEVEL): tomcat/tomcat.spec - install api and util jars with catal...

[pawelz]

Author: pawelz                       Date: Wed Jun  9 17:01:13 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- install api and util jars with catalina subpackage

---- Files affected:
packages/tomcat:
   tomcat.spec (1.172.2.6 -> 1.172.2.7) 

---- Diffs:

================================================================
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.172.2.6 packages/tomcat/tomcat.spec:1.172.2.7
--- packages/tomcat/tomcat.spec:1.172.2.6	Wed Jun  9 13:10:27 2010
+++ packages/tomcat/tomcat.spec	Wed Jun  9 19:01:05 2010
@@ -302,6 +302,8 @@
 mv $TOMCATDIR/lib/servlet-api.jar $RPM_BUILD_ROOT%{_javadir}/servlet-api-%{servletapiver}.jar
 mv $TOMCATDIR/lib/catalina.jar $RPM_BUILD_ROOT%{_javadir}/tomcat-catalina.jar
 mv $TOMCATDIR/lib/tomcat-coyote.jar $RPM_BUILD_ROOT%{_javadir}/tomcat-coyote.jar
+mv $TOMCATDIR/lib/tomcat-util.jar $RPM_BUILD_ROOT%{_javadir}/tomcat-util.jar
+mv $TOMCATDIR/lib/tomcat-api.jar $RPM_BUILD_ROOT%{_javadir}/tomcat-api.jar
 
 ln -s jsp-api-%{jspapiver}.jar $RPM_BUILD_ROOT%{_javadir}/jsp-api.jar
 ln -s servlet-api-%{servletapiver}.jar $RPM_BUILD_ROOT%{_javadir}/servlet-api.jar
@@ -314,6 +316,9 @@
 ln -sf %{_javadir}/servlet-api-%{servletapiver}.jar $TOMCATDIR/lib/servlet-api.jar
 
 ln -sf %{_javadir}/tomcat-catalina.jar $TOMCATDIR/lib/catalina.jar
+ln -sf %{_javadir}/tomcat-util.jar $TOMCATDIR/lib/util.jar
+ln -sf %{_javadir}/tomcat-api.jar $TOMCATDIR/lib/api.jar
+
 ln -sf %{_javadir}/tomcat-coyote.jar $TOMCATDIR/lib/tomcat-coyote.jar
 
 %if %{with extras}
@@ -362,6 +367,7 @@
 %{_tomcatdir}/bin/*.jar
 %dir %{_tomcatdir}/lib
 %{_tomcatdir}/lib/annotations-api.jar
+%{_tomcatdir}/lib/api.jar
 %{_tomcatdir}/lib/catalina-ant.jar
 %{_tomcatdir}/lib/catalina-ha.jar
 %{_tomcatdir}/lib/catalina.jar
@@ -380,6 +386,7 @@
 %{_tomcatdir}/lib/tomcat-i18n-es.jar
 %{_tomcatdir}/lib/tomcat-i18n-fr.jar
 %{_tomcatdir}/lib/tomcat-i18n-ja.jar
+%{_tomcatdir}/lib/util.jar
 
 %dir %{_tomcatdir}/webapps
 
@@ -439,7 +446,9 @@
 
 %files -n java-tomcat-catalina
 %defattr(644,root,root,755)
+%{_javadir}/tomcat-api.jar
 %{_javadir}/tomcat-catalina.jar
+%{_javadir}/tomcat-util.jar
 
 %files -n java-tomcat-coyote
 %defattr(644,root,root,755)
@@ -456,6 +465,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.172.2.7  2010/06/09 17:01:05  pawelz
+- install api and util jars with catalina subpackage
+
 Revision 1.172.2.6  2010/06/09 11:10:27  pawelz
 - Renamed libs: tomcat6-*.jar -> tomcat-*.jar
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat.spec?r1=1.172.2.6&r2=1.172.2.7&f=u