packages: cas-server/cas-server.spec - reverted subpackages - fixed %files ...

[pawelz]

Author: pawelz                       Date: Thu Feb 18 13:41:39 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- reverted subpackages
- fixed %files
- R: tomcat >= 6 (it may work with tomcat5, but we don't want to support it)

---- Files affected:
packages/cas-server:
   cas-server.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: packages/cas-server/cas-server.spec
diff -u packages/cas-server/cas-server.spec:1.9 packages/cas-server/cas-server.spec:1.10
--- packages/cas-server/cas-server.spec:1.9	Thu Feb 18 14:06:31 2010
+++ packages/cas-server/cas-server.spec	Thu Feb 18 14:41:33 2010
@@ -17,8 +17,7 @@
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
-# Require version that uses tomcat uid/gid
-Requires:	apache-tomcat >= 5.5.27-0.2
+Requires:	tomcat >= 6
 Requires:	jpackage-utils
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -39,22 +38,6 @@
     - Community documentation and implementation support
     - An extensive community of adopters
 
-%package core
-Summary:	JA-SIG CAS Core
-Group:		Development/Languages/Java
-Requires:	%{name}-%{version} = %{release}
-
-%description core
-JA-SIG CAS Core.
-
-%package webapp
-Summary:	JA-SIG CAS Web Application
-Group:		Applications/WWW
-Requires:	%{name}-%{version} = %{release}
-
-%description webapp
-JA-SIG CAS Web Application.
-
 %prep
 %setup -q
 
@@ -84,15 +67,9 @@
 # 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
-
-%files core
-%defattr(644,root,root,755)
-%{_datadir}/cas-server/cas-core.jar
-
-%files webapp
-%defattr(644,root,root,755)
+%dir %{_datadir}/cas-server
 %{_datadir}/cas-server/cas.war
-%attr(755,tomcat,tomcat) %dir %{_sharedstatedir}/cas-server
+%attr(2755,root,servlet) %dir %{_sharedstatedir}/cas-server
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -100,6 +77,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2010/02/18 13:41:33  pawelz
+- reverted subpackages
+- fixed %files
+- R: tomcat >= 6 (it may work with tomcat5, but we don't want to support it)
+
 Revision 1.9  2010/02/18 13:06:31  paszczus
 - added core subpackage
 - updated TODO
================================================================

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