packages: jira/jira.spec - use %_tomcatconfdir macro.
pawelz
pawelz at pld-linux.org
Thu Dec 9 01:49:09 CET 2010
Author: pawelz Date: Thu Dec 9 00:49:09 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- use %_tomcatconfdir macro.
---- Files affected:
packages/jira:
jira.spec (1.54 -> 1.55)
---- Diffs:
================================================================
Index: packages/jira/jira.spec
diff -u packages/jira/jira.spec:1.54 packages/jira/jira.spec:1.55
--- packages/jira/jira.spec:1.54 Thu Dec 9 01:38:15 2010
+++ packages/jira/jira.spec Thu Dec 9 01:49:04 2010
@@ -88,9 +88,9 @@
cp -a tmp/build/war/* $RPM_BUILD_ROOT%{_datadir}/jira
# configuration
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/jira,%{_sharedstatedir}/tomcat/conf/Catalina/localhost}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/jira,%{_tomcatconfdir}}
install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/jira/tomcat-context.xml
-ln -s %{_sysconfdir}/jira/tomcat-context.xml $RPM_BUILD_ROOT%{_sharedstatedir}/tomcat/conf/Catalina/localhost/jira.xml
+ln -s %{_sysconfdir}/jira/tomcat-context.xml $RPM_BUILD_ROOT%{_tomcatconfdir}/jira.xml
mv $RPM_BUILD_ROOT%{_datadir}/jira/WEB-INF/classes/jira-application.properties $RPM_BUILD_ROOT%{_sysconfdir}/jira/jira-application.properties
mv $RPM_BUILD_ROOT%{_datadir}/jira/WEB-INF/classes/log4j.properties $RPM_BUILD_ROOT%{_sysconfdir}/jira/log4j.properties
mv $RPM_BUILD_ROOT%{_datadir}/jira/WEB-INF/classes/entityengine.xml $RPM_BUILD_ROOT%{_sysconfdir}/jira/entityengine.xml
@@ -123,7 +123,7 @@
%{_datadir}/jira
%dir %attr(750,root,tomcat) %{_sysconfdir}/jira
%config(noreplace) %verify(not md5 mtime size) %attr(640,root,tomcat) %{_sysconfdir}/jira/*
-%config(missingok) %{_sharedstatedir}/tomcat/conf/Catalina/localhost/jira.xml
+%config(missingok) %{_tomcatconfdir}/jira.xml
%{_datadir}/tomcat/lib/*jar
%attr(2775,root,servlet) %dir %{_sharedstatedir}/jira
%attr(2775,root,servlet) %dir %{_sharedstatedir}/jira/jiradb
@@ -140,6 +140,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.55 2010/12/09 00:49:04 pawelz
+- use %_tomcatconfdir macro.
+
Revision 1.54 2010/12/09 00:38:15 pawelz
- up to 4.2.1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jira/jira.spec?r1=1.54&r2=1.55&f=u
More information about the pld-cvs-commit
mailing list