packages: confluence/confluence.spec - ln -sf is will overwrite without nee...

[glen]

Author: glen                         Date: Sat May 23 16:51:42 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- ln -sf is will overwrite without need to rm previously

---- Files affected:
packages/confluence:
   confluence.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/confluence/confluence.spec
diff -u packages/confluence/confluence.spec:1.2 packages/confluence/confluence.spec:1.3
--- packages/confluence/confluence.spec:1.2	Fri May 22 18:34:50 2009
+++ packages/confluence/confluence.spec	Sat May 23 18:51:37 2009
@@ -58,14 +58,9 @@
 
 ln -s %{_sharedstatedir}/tomcat/conf/Catalina/localhost/%{name}.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/tomcat-context.xml
 
-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/log4j.properties
-ln -s %{_sysconfdir}/%{name}/log4j.properties $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/log4j.properties
-
-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/confluence-init.properties
-ln -s %{_sysconfdir}/%{name}/confluence-init.properties $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/confluence-init.properties
-
-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/log4j.properties
-ln -s %{_sysconfdir}/%{name}/log4j.properties $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/log4j.properties
+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
+ln -sf %{_sysconfdir}/%{name}/log4j.properties $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/log4j.properties
 
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/log4j-diagnostic.properties $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/log4j-diagnostic.properties
 ln -s %{_sysconfdir}/%{name}/log4j-diagnostic.properties $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/log4j-diagnostic
@@ -81,9 +76,6 @@
 
 %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}/confluence
 %dir %{_sysconfdir}/confluence
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/log4j.properties
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/log4j-diagnostic.properties
@@ -91,6 +83,10 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/atlassian-user.xml
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/osuser.xml
 %{_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
+
 %config(noreplace) %verify(not md5 mtime size) %attr(2775,root,tomcat) %{_sharedstatedir}/tomcat/conf/Catalina/localhost/confluence.xml
 %attr(2775,root,servlet) %dir %{_sharedstatedir}/confluence
 %attr(2775,root,servlet) %dir /var/log/confluence
@@ -102,6 +98,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2009/05/23 16:51:37  glen
+- ln -sf is will overwrite without need to rm previously
+
 Revision 1.2  2009/05/22 16:34:50  pawelz
 - customized log4j.properties
 - mark more files as config
@@ -110,4 +109,3 @@
 Revision 1.1  2009/05/22 15:22:55  pawelz
 - confluence enterprise wiki
 - initial PLD release
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/confluence/confluence.spec?r1=1.2&r2=1.3&f=u