- reverted subpackages

- fixed %files
- R: tomcat >= 6 (it may work with tomcat5, but we don't want to support it)

Changed files:
    cas.spec -> 1.10

diff --git a/cas.spec b/cas.spec
index 5bc09b7685a462436aa517c9d9b21b435e1e90d6..80f0b6452f6c8103650e8afc2d328ee7b2ab4c2e 100644 (file)
--- a/cas.spec
+++ b/cas.spec
@@ -16,8 +16,7 @@ URL:          http://www.ja-sig.org/products/cas/
 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)
@@ -38,22 +37,6 @@ CAS provides enterprise single sign on service: CAS Downloads
     - 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
 
@@ -83,12 +66,6 @@ rm -rf $RPM_BUILD_ROOT
 # 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