packages: confluence/confluence.spec - use all these new cool tomcat-relate...

[pawelz]

Author: pawelz                       Date: Wed Mar 24 13:12:57 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use all these new cool tomcat-related rpm macros
- BR: rpmbuild(macros) >= 1.546
- clean tomcat cache in %postun

---- Files affected:
packages/confluence:
   confluence.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: packages/confluence/confluence.spec
diff -u packages/confluence/confluence.spec:1.13 packages/confluence/confluence.spec:1.14
--- packages/confluence/confluence.spec:1.13	Tue Dec 15 07:42:28 2009
+++ packages/confluence/confluence.spec	Wed Mar 24 14:12:51 2010
@@ -31,7 +31,7 @@
 %{?with_customized:BuildRequires:	jar}
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
-BuildRequires:	rpmbuild(macros) >= 1.300
+BuildRequires:	rpmbuild(macros) >= 1.546
 Requires:	jpackage-utils
 Requires:	tomcat
 Suggests:	graphviz
@@ -82,9 +82,11 @@
 cp -a tmp/build/war $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 # configuration
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_sharedstatedir}/tomcat/conf/Catalina/localhost}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_tomcatconfdir}}
+
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/tomcat-context.xml
+ln -sf %{_sysconfdir}/%{name}/tomcat-context.xml $RPM_BUILD_ROOT%{_tomcatconfdir}/%{name}.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
 
@@ -123,6 +125,9 @@
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/web.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/web.xml
 ln -s %{_sysconfdir}/%{name}/web.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/web.xml
 
+%postun
+%tomcat_clear_cache %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -146,7 +151,7 @@
 %{_datadir}/confluence
 %exclude %{_datadir}/confluence/WEB-INF/lib/confluence-pl_PL-plugin-1.0.jar
 
-%{_sharedstatedir}/tomcat/conf/Catalina/localhost/confluence.xml
+%{_tomcatconfdir}/%{name}.xml
 %attr(2775,root,servlet) %dir %{_sharedstatedir}/confluence
 %attr(2775,root,servlet) %dir /var/log/confluence
 
@@ -159,6 +164,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2010/03/24 13:12:51  pawelz
+- use all these new cool tomcat-related rpm macros
+- BR: rpmbuild(macros) >= 1.546
+- clean tomcat cache in %postun
+
 Revision 1.13  2009/12/15 06:42:28  pawelz
 - it works quite stable. Rel 1
 
================================================================

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