Author: pawelz Date: Sun Nov 22 16:56:54 2009 GMT Module: packages Tag: HEAD ---- Log message: - install tomcat-context.xml into /etc/jira and symlink it to tomcat conf - simplified %files
---- Files affected: packages/jira-enterprise: jira-enterprise.spec (1.25 -> 1.26) ---- Diffs: ================================================================ Index: packages/jira-enterprise/jira-enterprise.spec diff -u packages/jira-enterprise/jira-enterprise.spec:1.25 packages/jira-enterprise/jira-enterprise.spec:1.26 --- packages/jira-enterprise/jira-enterprise.spec:1.25 Sun Nov 22 01:32:59 2009 +++ packages/jira-enterprise/jira-enterprise.spec Sun Nov 22 17:56:48 2009 @@ -61,8 +61,8 @@ # configuration install -d $RPM_BUILD_ROOT{%{_sysconfdir}/jira,%{_sharedstatedir}/tomcat/conf/Catalina/localhost} -install %{SOURCE2} $RPM_BUILD_ROOT%{_sharedstatedir}/tomcat/conf/Catalina/localhost/jira.xml -ln -s %{_sharedstatedir}/tomcat/conf/Catalina/localhost/jira.xml $RPM_BUILD_ROOT%{_sysconfdir}/jira/tomcat-context.xml +install %{SOURCE2} $RPM_BUILD_ROOT%{_sharedstatedir}/jira/tomcat-context.xml +ln -s %{_sysconfdir}/jira/tomcat-context.xml $RPM_BUILD_ROOT%{_sharedstatedir}/tomcat/conf/Catalina/localhost/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 @@ -83,16 +83,10 @@ %files %defattr(644,root,root,755) -# do not make this file writeable by tomcat. We do not want to allow user to -# undeploy this app via tomcat manager. %{_datadir}/jira -%dir %{_sysconfdir}/jira -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jira/jira-application.properties -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jira/log4j.properties -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jira/entityengine.xml -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jira/osuser.xml -%{_sysconfdir}/jira/tomcat-context.xml -%config(noreplace) %verify(not md5 mtime size) %attr(2775,root,tomcat) %{_sharedstatedir}/tomcat/conf/Catalina/localhost/jira.xml +%dir %attr(750,root,tomcat) %{_sysconfdir}/jira +%config(noreplace) %verify(not md5 mtime size) %attr(640,root,tomcat) %{_sysconfdir}/jira/* +%{_sharedstatedir}/tomcat/conf/Catalina/localhost/jira.xml %{_datadir}/tomcat/lib/*jar %attr(2775,root,servlet) %dir %{_sharedstatedir}/jira %attr(2775,root,servlet) %dir %{_sharedstatedir}/jira/jiradb @@ -108,6 +102,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.26 2009/11/22 16:56:48 pawelz +- install tomcat-context.xml into /etc/jira and symlink it to tomcat conf +- simplified %files + Revision 1.25 2009/11/22 00:32:59 pawelz - asterisk in symlink creation in install section was expanded against /usr/share/... instead of $RPM_BUILD_ROOT/usr/share/..., so rpm was broken ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jira-enterprise/jira-enterprise.spec?r1=1.25&r2=1.26&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit