- separeted jasper jars to -jasper subpackage

[packages/apache-tomcat.git] / apache-tomcat.spec

diff --git a/apache-tomcat.spec b/apache-tomcat.spec
index c25a9f8aba2e7e793dd9b82687c02f4bc0abb07a..355a7adc99c2d05cc73e95e4e270f75447a03e82 100644 (file)
--- a/apache-tomcat.spec
+++ b/apache-tomcat.spec
@@ -33,10 +33,7 @@ BuildRequires:       ant >= 1.5.3
 BuildRequires: ant-trax
 BuildRequires: eclipse-jdt
 BuildRequires: jaas
-BuildRequires: java-commons-httpclient
 BuildRequires: jakarta-regexp >= 0:1.3
-#BuildRequires:        java-struts >= 0:1.2.7
-BuildRequires: java-struts >= 1.0.2
 BuildRequires: java-commons-beanutils >= 1.7
 BuildRequires: java-commons-collections >= 0:3.1
 BuildRequires: java-commons-collections-tomcat5 >= 0:3.1
@@ -46,6 +43,7 @@ BuildRequires:        java-commons-dbcp-tomcat5 >= 0:1.2.1
 BuildRequires: java-commons-digester >= 0:1.7
 BuildRequires: java-commons-el >= 0:1.0
 BuildRequires: java-commons-fileupload >= 0:1.0
+BuildRequires: java-commons-httpclient
 BuildRequires: java-commons-io >= 1.4
 BuildRequires: java-commons-launcher >= 0:0.9
 BuildRequires: java-commons-logging >= 0:1.0.4
@@ -53,6 +51,8 @@ BuildRequires:        java-commons-modeler >= 2.0
 BuildRequires: java-commons-pool >= 0:1.2
 BuildRequires: java-commons-pool-tomcat5 >= 0:1.2
 BuildRequires: java-servletapi5 = %{version}
+#BuildRequires:        java-struts >= 0:1.2.7
+BuildRequires: java-struts >= 1.0.2
 BuildRequires: javamail >= 0:1.3.1
 BuildRequires: jaxp_parser_impl >= 0:2.7.1
 BuildRequires: jdbc-stdext >= 0:2.0
@@ -77,6 +77,7 @@ Requires(pre):        /bin/id
 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
@@ -98,6 +99,7 @@ Requires:     jta >= 1.0.1
 Requires:      rc-scripts
 Requires:      xml-commons
 Provides:      group(tomcat)
+Provides:      java-servlet-container
 Provides:      user(tomcat)
 Obsoletes:     jakarta-tomcat
 BuildArch:     noarch
@@ -137,6 +139,13 @@ The Tomcat Servlet/JSP Container documentation.
 %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
@@ -220,7 +229,7 @@ jsp-api.jar=$(find-jar jsp-api)
 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 \
@@ -316,6 +325,12 @@ ln -sf $(find-jar jaxp_parser_impl) $TOMCATDIR/common/endorsed/jaxp_parser_impl.
 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
 
@@ -385,3 +400,9 @@ fi
 %defattr(644,root,root,755)
 %doc catalina/docs/*
 %endif
+
+%files jasper
+%defattr(644,root,root,755)
+%{_javadir}/jasper-compiler-jdt.jar
+%{_javadir}/jasper-compiler.jar
+%{_javadir}/jasper-runtime.jar