SPECS: hudson.spec - do not be so tomcat-centric. Use /usr/share/hudson ins...

[pawelz]

Author: pawelz                       Date: Sun Feb  1 23:27:58 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- do not be so tomcat-centric. Use /usr/share/hudson instead of
  /usr/share/tomcat/webapps/hudson
- not tested. Please backup you /var/lib/hudson befor upgrading!

---- Files affected:
SPECS:
   hudson.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/hudson.spec
diff -u SPECS/hudson.spec:1.6 SPECS/hudson.spec:1.7
--- SPECS/hudson.spec:1.6	Mon Jan 26 11:56:24 2009
+++ SPECS/hudson.spec	Mon Feb  2 00:27:52 2009
@@ -1,6 +1,6 @@
 # $Revision$, $Date$
 # TODO
-# - repackage .war with system jars?
+# - build it from sources
 %include	/usr/lib/rpm/macros.java
 Summary:	Hudson Continuous Build Server
 Name:		hudson
@@ -45,11 +45,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/hudson,%{_datadir}/tomcat/webapps/hudson,%{_sharedstatedir}/{hudson,tomcat/conf/Catalina/localhost}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/hudson,%{_datadir}/hudson,%{_sharedstatedir}/{hudson,tomcat/conf/Catalina/localhost}}
 install %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/hudson/web.xml
 install %SOURCE2 $RPM_BUILD_ROOT%{_sharedstatedir}/tomcat/conf/Catalina/localhost/hudson.xml
-cp -a . $RPM_BUILD_ROOT%{_datadir}/tomcat/webapps/hudson
-ln -sf %{_sysconfdir}/hudson/web.xml $RPM_BUILD_ROOT%{_datadir}/tomcat/webapps/hudson/WEB-INF/web.xml
+cp -a . $RPM_BUILD_ROOT%{_datadir}/hudson
+ln -sf %{_sysconfdir}/hudson/web.xml $RPM_BUILD_ROOT%{_datadir}/hudson/WEB-INF/web.xml
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,7 +61,7 @@
 # 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/hudson.xml
-%{_datadir}/tomcat/webapps/hudson
+%{_datadir}/hudson
 %attr(755,tomcat,tomcat) %dir %{_sharedstatedir}/hudson
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -70,6 +70,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2009/02/01 23:27:52  pawelz
+- do not be so tomcat-centric. Use /usr/share/hudson instead of
+  /usr/share/tomcat/webapps/hudson
+- not tested. Please backup you /var/lib/hudson befor upgrading!
+
 Revision 1.6  2009/01/26 10:56:24  pawelz
 - require apache-tomcat version that uses tomcat uid/gid
 
================================================================

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