packages (DEVEL): tomcat/tomcat.spec - Renamed libs: tomcat6-*.jar -> tomca...

[pawelz]

Author: pawelz                       Date: Wed Jun  9 11:10:32 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- Renamed libs: tomcat6-*.jar -> tomcat-*.jar

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

---- Diffs:

================================================================
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.172.2.5 packages/tomcat/tomcat.spec:1.172.2.6
--- packages/tomcat/tomcat.spec:1.172.2.5	Wed Jun  9 13:06:47 2010
+++ packages/tomcat/tomcat.spec	Wed Jun  9 13:10:27 2010
@@ -300,8 +300,8 @@
 mv $TOMCATDIR/lib/jasper*.jar $RPM_BUILD_ROOT%{_javadir}
 mv $TOMCATDIR/lib/jsp-api.jar $RPM_BUILD_ROOT%{_javadir}/jsp-api-%{jspapiver}.jar
 mv $TOMCATDIR/lib/servlet-api.jar $RPM_BUILD_ROOT%{_javadir}/servlet-api-%{servletapiver}.jar
-mv $TOMCATDIR/lib/catalina.jar $RPM_BUILD_ROOT%{_javadir}/tomcat6-catalina.jar
-mv $TOMCATDIR/lib/tomcat-coyote.jar $RPM_BUILD_ROOT%{_javadir}/tomcat6-coyote.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
 
 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
@@ -313,8 +313,8 @@
 ln -sf %{_javadir}/jsp-api-%{jspapiver}.jar $TOMCATDIR/lib/jsp-api.jar
 ln -sf %{_javadir}/servlet-api-%{servletapiver}.jar $TOMCATDIR/lib/servlet-api.jar
 
-ln -sf %{_javadir}/tomcat6-catalina.jar $TOMCATDIR/lib/catalina.jar
-ln -sf %{_javadir}/tomcat6-coyote.jar $TOMCATDIR/lib/tomcat-coyote.jar
+ln -sf %{_javadir}/tomcat-catalina.jar $TOMCATDIR/lib/catalina.jar
+ln -sf %{_javadir}/tomcat-coyote.jar $TOMCATDIR/lib/tomcat-coyote.jar
 
 %if %{with extras}
 install ../extras/catalina-ws.jar $TOMCATDIR/lib/catalina-ws.jar
@@ -439,11 +439,11 @@
 
 %files -n java-tomcat-catalina
 %defattr(644,root,root,755)
-%{_javadir}/tomcat6-catalina.jar
+%{_javadir}/tomcat-catalina.jar
 
 %files -n java-tomcat-coyote
 %defattr(644,root,root,755)
-%{_javadir}/tomcat6-coyote.jar
+%{_javadir}/tomcat-coyote.jar
 
 %files -n java-servletapi
 %defattr(644,root,root,755)
@@ -456,6 +456,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.172.2.6  2010/06/09 11:10:27  pawelz
+- Renamed libs: tomcat6-*.jar -> tomcat-*.jar
+
 Revision 1.172.2.5  2010/06/09 11:06:47  pawelz
 - fixed %doc. It builds now, but still needs some work (there are unpackaged files, and it is not tested)
 
================================================================

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