- up to 3.2

- minor refactoring of %install section

Changed files:
    confluence.spec -> 1.15

diff --git a/confluence.spec b/confluence.spec
index ffb35484836c6399684f849319f3042fc235034c..63c7cc9ef67f7a5c1a320280e8d06a30b7e876a8 100644 (file)
--- a/confluence.spec
+++ b/confluence.spec
@@ -9,14 +9,14 @@
 %include       /usr/lib/rpm/macros.java
 Summary:       Confluence - Enterprise wiki
 Name:          confluence
-Version:       3.1
+Version:       3.2
 Release:       1
 License:       Proprietary, not distributable
 Group:         Networking/Daemons/Java/Servlets
 # You can download it from:
 # http://www.atlassian.com/software/confluence/downloads/binary/confluence-%{version}.tar.gz
 Source0:       %{name}-%{version}.tar.gz
-# NoSource0-md5:       29b7e2e0c00f10ea18998797a3c91190
+# NoSource0-md5:       ac3ff24ae9770353db48faa38ca15be0
 NoSource:      0
 Source1:       %{name}-context.xml
 Source2:       %{name}-init.properties
@@ -87,16 +87,13 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/tomcat-context.xml
 ln -sf %{_sysconfdir}/%{name}/tomcat-context.xml $RPM_BUILD_ROOT%{_tomcatconfdir}/%{name}.xml
 
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/confluence-init.properties
+ln -sf %{_sysconfdir}/%{name}/confluence-init.properties $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/confluence-init.properties
+
 install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/log4j.properties
+ln -sf %{_sysconfdir}/%{name}/log4j.properties $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/classes/log4j.properties
 
 install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/lib/confluence-pl_PL-plugin-1.0.jar
 
-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
-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