packages: cas-server/cas-server.spec, cas-server/cas-server-context.xml (NE...

[pawelz]

Author: pawelz                       Date: Thu Feb 18 13:43:59 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added tomcat configuration
- unpack war file
- NFY

---- Files affected:
packages/cas-server:
   cas-server.spec (1.10 -> 1.11) , cas-server-context.xml (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/cas-server/cas-server.spec
diff -u packages/cas-server/cas-server.spec:1.10 packages/cas-server/cas-server.spec:1.11
--- packages/cas-server/cas-server.spec:1.10	Thu Feb 18 14:41:33 2010
+++ packages/cas-server/cas-server.spec	Thu Feb 18 14:43:54 2010
@@ -13,6 +13,7 @@
 Group:		Development/Languages/Java
 Source0:	http://www.ja-sig.org/downloads/cas/%{name}-%{version}-release.tar.gz
 # Source0-md5:	c12594a2af98ee2dd11a8c97895d91af
+Source1:	%{name}-context.xml
 URL:		http://www.ja-sig.org/products/cas/
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
@@ -40,12 +41,13 @@
 
 %prep
 %setup -q
+unzip modules/%{name}-webapp-%{version}.war -d webapp
 
 %build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/cas-server,%{_datadir}/cas-server,%{_sharedstatedir}/{cas-server,tomcat/conf/Catalina/localhost}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/cas-server,%{_datadir},%{_sharedstatedir}/{cas-server,tomcat/conf/Catalina/localhost}}
 
 MODULES="core integration-berkeleydb integration-jboss integration-memcached integration-restlet support-generic support-jdbc support-ldap support-legacy support-openid support-radius support-spnego support-trusted support-x509"
 
@@ -55,7 +57,7 @@
 #ln -sf %{_sysconfdir}/cas-server/web.xml $RPM_BUILD_ROOT%{_datadir}/tomcat/webapps/cas-server/WEB-INF/web.xml
 done
 
-install modules/%{name}-webapp-%{version}.war $RPM_BUILD_ROOT%{_datadir}/cas-server/cas.war
+cp -a webapp $RPM_BUILD_ROOT%{_datadir}/cas-server
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,7 +68,7 @@
 #%config(noreplace) %{_sysconfdir}/cas-server/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/cas-server.xml
+%config(noreplace) %{_sharedstatedir}/tomcat/conf/Catalina/localhost/cas-server.xml
 %dir %{_datadir}/cas-server
 %{_datadir}/cas-server/cas.war
 %attr(2755,root,servlet) %dir %{_sharedstatedir}/cas-server
@@ -77,6 +79,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2010/02/18 13:43:54  pawelz
+- added tomcat configuration
+- unpack war file
+- NFY
+
 Revision 1.10  2010/02/18 13:41:33  pawelz
 - reverted subpackages
 - fixed %files

================================================================
Index: packages/cas-server/cas-server-context.xml
diff -u /dev/null packages/cas-server/cas-server-context.xml:1.1
--- /dev/null	Thu Feb 18 14:43:59 2010
+++ packages/cas-server/cas-server-context.xml	Thu Feb 18 14:43:54 2010
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id$ -->
+<Context path="/cas-server" docBase="/usr/share/cas-server"
+        privileged="false" allowLinking="true">
+
+</Context>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cas-server/cas-server.spec?r1=1.10&r2=1.11&f=u