]> git.pld-linux.org Git - packages/apache-tomcat.git/blobdiff - apache-tomcat.spec
projects / packages / apache-tomcat.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- missing directory
[packages/apache-tomcat.git] / apache-tomcat.spec
diff --git a/apache-tomcat.spec b/apache-tomcat.spec
index ea28e0009524e4cf51353a3235617e5db8d18611..d50a0f25442b2da5a31af58cd54456273eeb073e 100644 (file)
--- a/apache-tomcat.spec
+++ b/apache-tomcat.spec
@@ -14,37 +14,40 @@ Group:              Development/Languages/Java
 Source0:       http://www.apache.org/dist/tomcat/tomcat-5/v%{version}/src/%{name}-%{version}-src.tar.gz
 # Source0-md5: eb3f196013550b9b1684e4ff18593a8e
 Source1:       %{name}.init
+Source2:       %{name}.sysconfig
 Patch0:                %{name}-skip-servletapi.patch
 Patch1:                %{name}-nsis.patch
 Patch2:                %{name}-native.patch
 Patch3:                %{name}-skip-jdt.patch
 Patch4:                %{name}-no-connectors.patch
 Patch5:                %{name}-dbcp.patch
+# this patch is needed for struts >= 1.3
+Patch6:                %{name}-struts.patch
 URL:           http://tomcat.apache.org/
 BuildRequires: ant >= 1.5.3
 BuildRequires: ant-trax
 BuildRequires: eclipse-jdt
 BuildRequires: jaas
-BuildRequires: jakarta-commons-beanutils >= 1.7
-BuildRequires: jakarta-commons-collections >= 0:3.1
-BuildRequires: jakarta-commons-collections-tomcat5 >= 0:3.1
-BuildRequires: jakarta-commons-daemon >= 1.0
-BuildRequires: jakarta-commons-dbcp >= 0:1.2.1
-BuildRequires: jakarta-commons-dbcp-tomcat5 >= 0:1.2.1
-BuildRequires: jakarta-commons-digester >= 0:1.7
-BuildRequires: jakarta-commons-el >= 0:1.0
-BuildRequires: jakarta-commons-fileupload >= 0:1.0
-BuildRequires: jakarta-commons-httpclient
-BuildRequires: jakarta-commons-launcher >= 0:0.9
-BuildRequires: jakarta-commons-io >= 1.4
-BuildRequires: jakarta-commons-logging >= 0:1.0.4
-BuildRequires: jakarta-commons-modeler >= 2.0
-BuildRequires: jakarta-commons-pool >= 0:1.2
-BuildRequires: jakarta-commons-pool-tomcat5 >= 0:1.2
+BuildRequires: java-commons-httpclient
 BuildRequires: jakarta-regexp >= 0:1.3
-BuildRequires: jakarta-servletapi5
-#BuildRequires:        jakarta-struts >= 0:1.2.7
-BuildRequires: jakarta-struts >= 1.0.2
+#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
+BuildRequires: java-commons-daemon >= 1.0
+BuildRequires: java-commons-dbcp >= 0:1.2.1
+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-io >= 1.4
+BuildRequires: java-commons-launcher >= 0:0.9
+BuildRequires: java-commons-logging >= 0:1.0.4
+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: javamail >= 0:1.3.1
 BuildRequires: jaxp_parser_impl >= 0:2.7.1
 BuildRequires: jdbc-stdext >= 0:2.0
@@ -71,15 +74,15 @@ Requires(pre):      /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires:      jaas
 #Requires:     jaf >= 1.0.1
-#Requires:     jakarta-commons-beanutils
-#Requires:     jakarta-commons-collections
-#Requires:     jakarta-commons-dbcp-tomcat5
-#Requires:     jakarta-commons-digester
-Requires:      jakarta-commons-el
-#Requires:     jakarta-commons-fileupload
-#Requires:     jakarta-commons-logging
 Requires:      jakarta-regexp
-Requires:      jakarta-servletapi >= 4
+#Requires:     java-commons-beanutils
+#Requires:     java-commons-collections
+#Requires:     java-commons-dbcp-tomcat5
+#Requires:     java-commons-digester
+Requires:      java-commons-el
+#Requires:     java-commons-fileupload
+#Requires:     java-commons-logging
+Requires:      java-servletapi5 = %{version}
 Requires:      javamail >= 1.2
 Requires:      jaxp_parser_impl
 Requires:      jdbc-stdext >= 2.0
@@ -119,7 +122,7 @@ Community Process.
 
 %package doc
 Summary:       The Apache Tomcat Servlet/JSP Container documentation
-Summary(pl.UTF-8):     Dokumentacja do Tomcata - kontekera Servlet/JSP
+Summary(pl.UTF-8):     Dokumentacja do Tomcata - kontenera Servlet/JSP
 Group:         Development/Languages/Java
 Obsoletes:     jakarta-tomcat-doc
 
@@ -127,7 +130,7 @@ Obsoletes:  jakarta-tomcat-doc
 The Tomcat Servlet/JSP Container documentation.
 
 %description doc -l pl.UTF-8
-Dokumentacja do Tomcata - kontekera Servlet/JSP.
+Dokumentacja do Tomcata - kontenera Servlet/JSP.
 
 %prep
 %setup -q -n %{name}-%{version}-src
@@ -137,6 +140,7 @@ Dokumentacja do Tomcata - kontekera Servlet/JSP.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # servletapi built from jakarta-servletapi5.spec
 rm -rf servletapi
@@ -144,9 +148,6 @@ rm -rf servletapi
 # Remove pre-built jars
 find -name '*.jar' | xargs rm -fv
 
-# for jakarta-struts >= 1.3.10
-find -name '*.jsp' | xargs sed -i 's/<html:html locale="true">/<html:html>/'
-
 %build
 TOPDIR=$(pwd)
 
@@ -214,7 +215,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}/jakarta-struts
+struts.lib=%{_datadir}/java-struts
 EOF
 
 %ant \
@@ -236,14 +237,17 @@ install -d $TOMCATDIR/bin \
            $TOMCATDIR/common/{lib,classes,endorsed} \
            $TOMCATDIR/server/{lib,classes} \
            $TOMCATDIR/webapps \
-           $RPM_BUILD_ROOT%{_sysconfdir} \
            $RPM_BUILD_ROOT%{_logdir}/tomcat \
+           $RPM_BUILD_ROOT%{_vardir}/webapps \
            $RPM_BUILD_ROOT%{_vardir}/work \
+           $RPM_BUILD_ROOT%{_vardir}/conf \
+           $RPM_BUILD_ROOT/etc/sysconfig \
            $RPM_BUILD_ROOT/etc/rc.d/init.d
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/tomcat
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/tomcat
 
-cp -pR conf/* $RPM_BUILD_ROOT%{_sysconfdir}
+cp -pR conf/* $CATALINADIR/conf
 cp -HR bin common server $TOMCATDIR
 
 cp -rf server/webapps $TOMCATDIR/server
@@ -251,9 +255,10 @@ cp -rf webapps $TOMCATDIR
 cp -rf shared $TOMCATDIR
 cp -rf temp $TOMCATDIR
 
-ln -sf %{_logdir}/tomcat $TOMCATDIR/logs
+ln -sf %{_logdir}/tomcat $CATALINADIR/logs
 ln -sf %{_vardir}/work $TOMCATDIR/work
-ln -sf %{_sysconfdir} $TOMCATDIR/conf
+ln -sf %{_vardir}/conf $TOMCATDIR/conf
+ln -sf %{_vardir}/conf $RPM_BUILD_ROOT%{_sysconfdir}
 
 # symlinks instead of copies
 ln -sf $(find-jar commons-el) $TOMCATDIR/common/lib/commons-el.jar
@@ -327,11 +332,11 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc build/{RELEASE-NOTES,RUNNING.txt}
-# tomcat wants to regenerate tomcat-users.xml
-%dir %attr(775,root,http) %{_sysconfdir}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
 %attr(754,root,root) /etc/rc.d/init.d/tomcat
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfdir/tomcat
+%{_sysconfdir}
 %dir %{_tomcatdir}
+%dir %{_tomcatdir}/conf
 %dir %{_tomcatdir}/bin
 %{_tomcatdir}/bin/catalina-tasks.xml
 %{_tomcatdir}/bin/jkstatus-tasks.xml
@@ -348,8 +353,6 @@ fi
 %lang(fr) %{_tomcatdir}/common/i18n/tomcat-i18n-fr.jar
 %lang(ja) %{_tomcatdir}/common/i18n/tomcat-i18n-ja.jar
 %{_tomcatdir}/common/lib
-%{_tomcatdir}/conf
-%{_tomcatdir}/logs
 %dir %{_tomcatdir}/server
 %dir %{_tomcatdir}/server/classes
 %{_tomcatdir}/server/lib
@@ -359,8 +362,13 @@ fi
 %{_tomcatdir}/shared
 %{_tomcatdir}/temp
 %dir %{_vardir}
+# tomcat config has to be writeable because of tomacta-users.xml file and
+# Catalina dir
+%config(noreplace) %attr(775,root,http) %verify(not md5 mtime size) %{_vardir}/conf
 %dir %attr(1730,root,http) %{_vardir}/work
-%dir %attr(1730,root,http) %{_logdir}/tomcat
+%dir %attr(775,root,http) %{_vardir}/webapps
+%dir %attr(775,root,http) %{_logdir}/tomcat
+%{_vardir}/logs
 
 %if 0
 %files doc
This page took 0.035736 seconds and 4 git commands to generate.