SPECS: apache-tomcat.spec - separeted jasper jars to -jasper subpackage

[paszczus]

Author: paszczus                     Date: Wed Apr  1 07:38:42 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- separeted jasper jars to -jasper subpackage

---- Files affected:
SPECS:
   apache-tomcat.spec (1.77 -> 1.78) 

---- Diffs:

================================================================
Index: SPECS/apache-tomcat.spec
diff -u SPECS/apache-tomcat.spec:1.77 SPECS/apache-tomcat.spec:1.78
--- SPECS/apache-tomcat.spec:1.77	Mon Feb  2 19:05:51 2009
+++ SPECS/apache-tomcat.spec	Wed Apr  1 09:38:37 2009
@@ -78,6 +78,7 @@
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
+Requires:	%{name}-jasper = %{version}
 Requires:	jaas
 #Requires:	jaf >= 1.0.1
 Requires:	jakarta-regexp
@@ -139,6 +140,13 @@
 %description doc -l pl.UTF-8
 Dokumentacja do Tomcata - kontenera Servlet/JSP.
 
+%package jasper
+Summary:	Jasper classes from Apache Tomcat
+Group:		Libraries/Java
+
+%description jasper
+This package contains compiled classes of Apache Tomcat`s Jasper.
+
 %prep
 %setup -q -n %{name}-%{version}-src
 %patch0 -p1
@@ -222,7 +230,7 @@
 jspapi.build.notrequired=true
 log4j.jar=$(find-jar log4j)
 tomcat-dbcp.jar=$(find-jar commons-dbcp-tomcat5)
-struts.lib=%{_datadir}/java-struts
+struts.lib=%{_javadir}-struts
 EOF
 
 %ant \
@@ -318,6 +326,12 @@
 ln -sf $(find-jar xml-commons-apis) $TOMCATDIR/common/endorsed/xml-commons-apis.jar
 ln -sf $(find-jar struts-core) $TOMCATDIR/server/webapps/admin/WEB-INF/lib/struts-core.jar
 
+install -d $RPM_BUILD_ROOT%{_javadir}
+mv $TOMCATDIR/common/lib/jasper* $RPM_BUILD_ROOT%{_javadir}
+ln -sf %{_javadir}/jasper-compiler-jdt.jar $TOMCATDIR/common/lib/
+ln -sf %{_javadir}/jasper-compiler.jar $TOMCATDIR/common/lib/
+ln -sf %{_javadir}/jasper-compiler-runtime.jar $TOMCATDIR/common/lib/
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -388,12 +402,21 @@
 %doc catalina/docs/*
 %endif
 
+%files jasper
+%defattr(644,root,root,755)
+%{_javadir}/jasper-compiler-jdt.jar
+%{_javadir}/jasper-compiler.jar
+%{_javadir}/jasper-runtime.jar
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.78  2009/04/01 07:38:37  paszczus
+- separeted jasper jars to -jasper subpackage
+
 Revision 1.77  2009/02/02 18:05:51  pawelz
 - P: java-servlet-container
 - sorted BRs
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache-tomcat.spec?r1=1.77&r2=1.78&f=u