packages: jtrac/jtrac.spec - unpack war file to allow log4j.properties cust...

[pawelz]

Author: pawelz                       Date: Thu Nov 19 13:06:16 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unpack war file to allow log4j.properties customization (this reverts rev 1.4)
- log4j configuration
- install tomcat context into /etc/jtrack and symlink it to /etc/tomcat/... it
  seems to be better way (similar to /etc/webapps.d)

---- Files affected:
packages/jtrac:
   jtrac.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/jtrac/jtrac.spec
diff -u packages/jtrac/jtrac.spec:1.6 packages/jtrac/jtrac.spec:1.7
--- packages/jtrac/jtrac.spec:1.6	Wed Nov 18 14:58:08 2009
+++ packages/jtrac/jtrac.spec	Thu Nov 19 14:06:10 2009
@@ -12,10 +12,12 @@
 # Source0-md5:  6254396d33012f65d0886b67287b257b
 Source1:	%{name}-context.xml
 Source2:	%{name}.properties
+Source3:	%{name}-log4j.properties
 URL:		http://sourceforge.net/projects/j-trac/
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
+BuildRequires:	unzip
 Requires:	java-sun-jre >= 1.6.0.17
 Requires:	jpackage-utils
 Requires:	tomcat
@@ -31,15 +33,19 @@
 %prep
 %setup -qn %{name}
 
+unzip -qd jtrac jtrac.war
+
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_datadir}/%{name},%{_sharedstatedir}/{%{name},tomcat/conf/Catalina/localhost}}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sharedstatedir}/tomcat/conf/Catalina/localhost/%{name}.xml
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_datadir},%{_sharedstatedir}/{%{name},tomcat/conf/Catalina/localhost},/var/log/%{name}}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/tomcat-context.xml
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.properties
-cp %{name}.war $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}.war
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/log4j.properties
+cp -a %{name} $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-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 -s %{_sysconfdir}/%{name}/%{name}.properties $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/%{name}.properties
+ln -sf %{_sysconfdir}/%{name}/log4j.properties $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/log4j.properties
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -49,11 +55,13 @@
 %dir %{_sysconfdir}/%{name}
 # do not make this file writeable by tomcat. We do not want to allow user to
 # undeploy this app via tomcat manager.
-%verify(not md5 mtime size) %config(noreplace) %{_sharedstatedir}/tomcat/conf/Catalina/localhost/%{name}.xml
-%{_sysconfdir}/%{name}/tomcat-context.xml
+%{_sharedstatedir}/tomcat/conf/Catalina/localhost/%{name}.xml
+%verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/%{name}/tomcat-context.xml
 %verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.properties
+%verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/%{name}/log4j.properties
 %{_datadir}/%{name}
-%attr(2775,root,servlet) %{_sharedstatedir}/%{name}
+%attr(770,root,servlet) %{_sharedstatedir}/%{name}
+%attr(770,root,servlet) /var/log/%{name}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -61,6 +69,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2009/11/19 13:06:10  pawelz
+- unpack war file to allow log4j.properties customization (this reverts rev 1.4)
+- log4j configuration
+- install tomcat context into /etc/jtrack and symlink it to /etc/tomcat/... it
+  seems to be better way (similar to /etc/webapps.d)
+
 Revision 1.6  2009/11/18 13:58:08  pawelz
 - install config files
 - remove garbage from %changelog
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jtrac/jtrac.spec?r1=1.6&r2=1.7&f=u