packages (DEVEL): tomcat/tomcat.spec - merged HEAD - rel 3

[pawelz]

Author: pawelz                       Date: Thu Aug  5 08:25:03 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- merged HEAD
- rel 3

---- Files affected:
packages/tomcat:
   tomcat.spec (1.172.2.16 -> 1.172.2.17) 

---- Diffs:

================================================================
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.172.2.16 packages/tomcat/tomcat.spec:1.172.2.17
--- packages/tomcat/tomcat.spec:1.172.2.16	Tue Jul 20 13:57:18 2010
+++ packages/tomcat/tomcat.spec	Thu Aug  5 10:24:57 2010
@@ -7,7 +7,7 @@
 %define		servletapiver	3.0
 
 %define		subver	beta
-%define		rel	2
+%define		rel	3
 # Java Commons Logging version. Must be >= 1.1.
 %define		jclver	1.1.1
 
@@ -86,7 +86,6 @@
 %define		_tomcatdir	%{_datadir}/tomcat
 %define 	_logdir		%{_var}/log
 %define		_vardir		%{_var}/lib/tomcat
-%define		_sysconfdir	/etc/tomcat
 
 %define find_jar() %{expand:%%define jarfile {%(jar=$(find-jar %1); echo ${jar:-%%nil})}}%{?jarfile}%{!?jarfile:%{error:find-jar %1 failed}}%{nil}
 
@@ -237,6 +236,7 @@
 Provides:	java(jsp) = %{jspapiver}
 Provides:	java(servlet) = %{servletapiver}
 Obsoletes:	java-servletapi5
+Obsoletes:	jakarta-servletapi5
 
 %description -n java-servletapi
 Implementation classes of the Java Servlet and JSP APIs (packages
@@ -264,7 +264,7 @@
 rm bin/*.bat
 rm bin/{startup,shutdown}.sh
 
-cp %{SOURCE3} build.properties
+cp -a %{SOURCE3} build.properties
 
 %build
 export LC_ALL=en_US
@@ -303,6 +303,11 @@
 TOMCATDIR=$RPM_BUILD_ROOT%{_tomcatdir}
 CATALINADIR=$RPM_BUILD_ROOT/var/lib/tomcat
 
+# useful for constructing relative symlinks. Is there a better way?
+TOMCATDIRREV=$(echo %{_tomcatdir} | sed 's#[^/]\+#..#g;s#^/##')
+CATALINADIRREV=$(echo /var/lib/tomcat | sed 's#[^/]\+#..#g;s#^/##')
+SYSCONFDIRREV=$(echo %{_sysconfdir} | sed 's#[^/]\+#..#g;s#^/##')
+
 install -d $TOMCATDIR \
 	    $CATALINADIR/temp \
 	    $RPM_BUILD_ROOT%{_vardir}/webapps \
@@ -326,11 +331,11 @@
 cp -a bin lib webapps $TOMCATDIR
 cp -a temp $CATALINADIR
 
-ln -sf %{_logdir}/tomcat $CATALINADIR/logs
-ln -sf %{_logdir}/tomcat $TOMCATDIR/logs
-ln -sf %{_vardir}/work $TOMCATDIR/work
-ln -sf %{_vardir}/conf $TOMCATDIR/conf
-ln -sf %{_vardir}/conf $RPM_BUILD_ROOT%{_sysconfdir}
+ln -sf $CATALINADIRREV%{_logdir}/tomcat $CATALINADIR/logs
+ln -sf $TOMCATDIRREV%{_logdir}/tomcat $TOMCATDIR/logs
+ln -sf $TOMCATDIRREV%{_vardir}/work $TOMCATDIR/work
+ln -sf $TOMCATDIRREV%{_vardir}/conf $TOMCATDIR/conf
+ln -sf $SYSCONFDIRREV%{_vardir}/conf $RPM_BUILD_ROOT%{_sysconfdir}/tomcat
 
 # symlinks instead of copies
 jars="commons-daemon commons-logging-api"
@@ -410,7 +415,7 @@
 %doc KEYS RELEASE-NOTES TOMCAT-7-RELEASE-PLAN.txt
 %attr(754,root,root) /etc/rc.d/init.d/tomcat
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/tomcat
-%{_sysconfdir}
+%{_sysconfdir}/tomcat
 %dir %{_tomcatdir}
 %dir %{_tomcatdir}/conf
 %dir %{_tomcatdir}/bin
@@ -523,6 +528,17 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.172.2.17  2010/08/05 08:24:57  pawelz
+- merged HEAD
+- rel 3
+
+Revision 1.178  2010/08/05 08:19:09  pawelz
+- use relative symlinks for directories
+- rel 2
+
+Revision 1.176  2010/07/20 10:24:54  glen
+- java-servletapi O: jakarta-servletapi5
+
 Revision 1.172.2.16  2010/07/20 11:57:18  pawelz
 - merged changes from HEAD:
 - apply URIEncoding="UTF-8" patch
================================================================

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