Author: pawelz Date: Thu Dec 10 08:07:33 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- install tomcat-context in /etc/confluence and link it to tomcat conf directory
---- Files affected:
packages/confluence:
confluence.spec (1.10 -> 1.11)
---- Diffs:
================================================================
Index: packages/confluence/confluence.spec
diff -u packages/confluence/confluence.spec:1.10
packages/confluence/confluence.spec:1.11
--- packages/confluence/confluence.spec:1.10 Mon Nov 9 08:23:55 2009
+++ packages/confluence/confluence.spec Thu Dec 10 09:07:28 2009
@@ -84,13 +84,13 @@
# configuration
install -d
$RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_sharedstatedir}/tomcat/conf/Catalina/localhost}
-install %{SOURCE1}
$RPM_BUILD_ROOT%{_sharedstatedir}/tomcat/conf/Catalina/localhost/confluence.xml
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/confluence/tomcat-context.xml
install %{SOURCE2}
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/confluence-init.properties
install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/log4j.properties
install %{SOURCE5}
$RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/lib/confluence-pl_PL-plugin-1.0.jar
-ln -s %{_sharedstatedir}/tomcat/conf/Catalina/localhost/%{name}.xml
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/tomcat-context.xml
+ln -s %{_sysconfdir}/%{name}/tomcat-context.xml
$RPM_BUILD_ROOT%{_sharedstatedir}/tomcat/conf/Catalina/localhost/%{name}.xml
ln -sf %{_sysconfdir}/%{name}/log4j.properties
$RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/log4j.properties
ln -sf %{_sysconfdir}/%{name}/confluence-init.properties
$RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/confluence-init.properties
@@ -128,6 +128,7 @@
%files
%defattr(644,root,root,755)
+%doc README.PLD licenses
%dir %attr(750,root,servlet) %{_sysconfdir}/confluence
%config(noreplace) %verify(not md5 mtime size) %attr(640,root,servlet)
%{_sysconfdir}/%{name}/log4j.properties
%config(noreplace) %verify(not md5 mtime size) %attr(640,root,servlet)
%{_sysconfdir}/%{name}/log4j-diagnostic.properties
@@ -142,14 +143,12 @@
%config(noreplace) %verify(not md5 mtime size) %attr(640,root,servlet)
%{_sysconfdir}/%{name}/web.xml
%config(noreplace) %verify(not md5 mtime size) %attr(640,root,servlet)
%{_sysconfdir}/%{name}/tomcat-context.xml
-# do not make this file writeable by tomcat. We do not want to undeploy this
app via tomcat manager.
%{_datadir}/confluence
%exclude %{_datadir}/confluence/WEB-INF/lib/confluence-pl_PL-plugin-1.0.jar
-%config(noreplace) %verify(not md5 mtime size) %attr(2775,root,tomcat)
%{_sharedstatedir}/tomcat/conf/Catalina/localhost/confluence.xml
+%{_sharedstatedir}/tomcat/conf/Catalina/localhost/confluence.xml
%attr(2775,root,servlet) %dir %{_sharedstatedir}/confluence
%attr(2775,root,servlet) %dir /var/log/confluence
-%doc README.PLD licenses
%files lang-pl
%{_datadir}/confluence/WEB-INF/lib/confluence-pl_PL-plugin-1.0.jar
@@ -160,6 +159,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.11 2009/12/10 08:07:28 pawelz
+- install tomcat-context in /etc/confluence and link it to tomcat conf
directory
+
Revision 1.10 2009/11/09 07:23:55 pawelz
- up to 3.0.2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/confluence/confluence.spec?r1=1.10&r2=1.11&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
