packages: sonar/sonar.spec - G: Networking/Daemons/Java/Servlets - do not i...

[pawelz]

Author: pawelz                       Date: Wed Jun 17 06:59:52 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- G: Networking/Daemons/Java/Servlets
- do not install web.xml in /etc nor mark it as %config
- fixed %files

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

---- Diffs:

================================================================
Index: packages/sonar/sonar.spec
diff -u packages/sonar/sonar.spec:1.2 packages/sonar/sonar.spec:1.3
--- packages/sonar/sonar.spec:1.2	Fri Mar  6 16:58:52 2009
+++ packages/sonar/sonar.spec	Wed Jun 17 08:59:47 2009
@@ -7,7 +7,7 @@
 Version:	1.6
 Release:	0.1
 License:	GPL v2
-Group:		Development/Languages/Java
+Group:		Networking/Daemons/Java/Servlets
 Source0:	http://dist.sonar.codehaus.org/sonar-1.6.zip
 # Source0-md5:	accde4b27b491e63fdba3995759162f5
 Source1:	%{name}-context.xml
@@ -36,8 +36,7 @@
 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
-cp -a sonar-web/* $RPM_BUILD_ROOT%{_datadir}/%{name}
-ln -sf %{_sysconfdir}/%{name}/web.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/web.xml
+cp -a war/build/sonar-web/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,7 +44,6 @@
 %files
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}/%{name}
-%config(noreplace) %{_sysconfdir}/%{name}/web.xml
 # do not make this file writeable by tomcat. We do not want to allow user to
 # undeploy this app via tomcat manager.
 %config(noreplace) %{_sharedstatedir}/tomcat/conf/Catalina/localhost/%{name}.xml
@@ -58,6 +56,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2009/06/17 06:59:47  pawelz
+- G: Networking/Daemons/Java/Servlets
+- do not install web.xml in /etc nor mark it as %config
+- fixed %files
+
 Revision 1.2  2009/03/06 15:58:52  pawelz
 - removed Source1 (web.xml)
 
================================================================

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