packages: rpm-build-macros/rpm-build-macros.spec, rpm-build-macros/rpm.macr...

[pawelz]

Author: pawelz                       Date: Thu Feb 18 14:49:08 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- %_tomcatconfdir
- 1.540

---- Files affected:
packages/rpm-build-macros:
   rpm-build-macros.spec (1.237 -> 1.238) , rpm.macros (1.539 -> 1.540) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.237 packages/rpm-build-macros/rpm-build-macros.spec:1.238
--- packages/rpm-build-macros/rpm-build-macros.spec:1.237	Sun Feb 14 14:16:29 2010
+++ packages/rpm-build-macros/rpm-build-macros.spec	Thu Feb 18 15:49:03 2010
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%define		rpm_macros_rev	1.539
+%define		rpm_macros_rev	1.540
 %define		find_lang_rev	1.32
 Summary:	PLD Linux RPM build macros
 Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
@@ -90,6 +90,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.238  2010/02/18 14:49:03  pawelz
+- %_tomcatconfdir
+- 1.540
+
 Revision 1.237  2010/02/14 13:16:29  glen
 - if topdir logic is off, then spec/sourcedir won't work either
 

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.539 packages/rpm-build-macros/rpm.macros:1.540
--- packages/rpm-build-macros/rpm.macros:1.539	Sun Feb 14 14:16:29 2010
+++ packages/rpm-build-macros/rpm.macros	Thu Feb 18 15:49:03 2010
@@ -1276,6 +1276,10 @@
 fi\
 echo -e "</dependencies>\\n" >> %{_mavendepmapdir}/maven2-depmap.xml
 
+# JAVA macros specific for PLD
+
+# Directory for tomcat context configuration files
+%_tomcatconfdir	%{_sharedstatedir}/tomcat/conf/Catalina/localhost
 
 # PEAR install macros
 # Author: Elan Ruusamäe <glen at pld-linux.org>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm-build-macros.spec?r1=1.237&r2=1.238&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.539&r2=1.540&f=u