- 1.681: _tomcatconfdir to /etc

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index b26b03f162c08738104e1ec46ae9b05eba4f45d1..464853516f371dcac45d98071e8c478c79fcd92e 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -5,7 +5,7 @@
 %if "%{pld_release}" == "ac"
 %define        with_rpm4       1
 %endif
-%define                rpm_macros_rev  1.680
+%define                rpm_macros_rev  1.681
 %define                find_lang_rev   1.36
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD

diff --git a/rpm.macros b/rpm.macros
index 39e0707a048b25ce13af33a21b6e19635ecea60c..c3292f0f398e8d8aaede360616b635abb82161ca 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -1490,7 +1490,7 @@ 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
+%_tomcatconfdir        /etc/tomcat/Catalina/localhost
 
 # Tomcat cache path
 %_tomcatcachedir %{_sharedstatedir}/tomcat/work/Catalina/localhost