Author: paszczus                     Date: Thu Feb 18 12:52:01 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use binaries instead of sources because of mvn
- the most important package is cas-server-webapp, so it`s now packaged
- TODO added

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

---- Diffs:

================================================================
Index: packages/cas-server/cas-server.spec
diff -u packages/cas-server/cas-server.spec:1.6 
packages/cas-server/cas-server.spec:1.7
--- packages/cas-server/cas-server.spec:1.6     Thu Feb 18 13:30:36 2010
+++ packages/cas-server/cas-server.spec Thu Feb 18 13:51:56 2010
@@ -1,4 +1,9 @@
 # $Revision$, $Date$
+#
+# TODO:
+# - package all modules (modules/*.war)
+# - subpackages for modules
+# - fix tomcat path
 %include       /usr/lib/rpm/macros.java
 Summary:       JA-SIG Central Authentication Service
 Name:          cas-server
@@ -10,7 +15,6 @@
 # Source0-md5: c12594a2af98ee2dd11a8c97895d91af
 URL:           http://www.ja-sig.org/products/cas/
 BuildRequires: jpackage-utils
-BuildRequires: maven
 BuildRequires: rpm-javaprov
 BuildRequires: rpmbuild(macros) >= 1.300
 # Require version that uses tomcat uid/gid
@@ -39,13 +43,12 @@
 %setup -q
 
 %build
-mvn package install
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d 
$RPM_BUILD_ROOT{%{_sysconfdir}/cas-server,%{_datadir}/cas-server,%{_sharedstatedir}/{cas-server,tomcat/conf/Catalina/localhost}}
-cp -a . $RPM_BUILD_ROOT%{_datadir}/cas-server
-ln -sf %{_sysconfdir}/cas-server/web.xml 
$RPM_BUILD_ROOT%{_datadir}/tomcat/webapps/cas-server/WEB-INF/web.xml
+install modules/%{name}-webapp-%{version}.war 
$RPM_BUILD_ROOT%{_datadir}/cas-server/cas.war
+#ln -sf %{_sysconfdir}/cas-server/web.xml 
$RPM_BUILD_ROOT%{_datadir}/tomcat/webapps/cas-server/WEB-INF/web.xml
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -53,10 +56,10 @@
 %files
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}/cas-server
-%config(noreplace) %{_sysconfdir}/cas-server/web.xml
+#%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
 %{_datadir}/cas-server
 %attr(755,tomcat,tomcat) %dir %{_sharedstatedir}/cas-server
 
@@ -66,6 +69,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2010/02/18 12:51:56  paszczus
+- use binaries instead of sources because of mvn
+- the most important package is cas-server-webapp, so it`s now packaged
+- TODO added
+
 Revision 1.6  2010/02/18 12:30:36  paszczus
 - version bumped to 3.3.5
 
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to