packages: tomcat/tomcat.spec - use relative symlinks for directories - rel 2

[pawelz]

Author: pawelz                       Date: Thu Aug  5 08:19:14 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use relative symlinks for directories
- rel 2

---- Files affected:
packages/tomcat:
   tomcat.spec (1.177 -> 1.178) 

---- Diffs:

================================================================
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.177 packages/tomcat/tomcat.spec:1.178
--- packages/tomcat/tomcat.spec:1.177	Fri Jul 23 13:40:05 2010
+++ packages/tomcat/tomcat.spec	Thu Aug  5 10:19:09 2010
@@ -12,7 +12,7 @@
 Summary(pl.UTF-8):	Serwer www i silnik Servlet/JSP będący wzorcową implementacją API Servlet %{servletapiver}/JSP %{jspapiver}
 Name:		tomcat
 Version:	6.0.29
-Release:	1
+Release:	2
 License:	Apache v2.0
 Group:		Networking/Daemons/Java
 Source0:	http://www.apache.org/dist/tomcat/tomcat-6/v%{version}/src/apache-%{name}-%{version}-src.tar.gz
@@ -78,7 +78,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}
 
@@ -256,6 +255,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 \
@@ -279,11 +283,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"
@@ -355,7 +359,7 @@
 %doc KEYS RELEASE-NOTES RELEASE-PLAN-6.0.txt RUNNING.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
@@ -458,6 +462,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.178  2010/08/05 08:19:09  pawelz
+- use relative symlinks for directories
+- rel 2
+
 Revision 1.177  2010/07/23 11:40:05  pawelz
 - up to 6.0.29
 
================================================================

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