]> git.pld-linux.org Git - packages/apache-tomcat.git/blobdiff - apache-tomcat.spec
- merge from tomcat5 branch
[packages/apache-tomcat.git] / apache-tomcat.spec
index 586f032a7d255074da5a6ed3c05a2a17f5b303a5..77d06a8eacd6fc7159da535cf89593b60b6e40f2 100644 (file)
@@ -1,14 +1,14 @@
+%define                base_version 4.0
 Summary:       The Tomcat Servlet/JSP Container
-Summary(pl):   Tomcat - Zasobnik servletów/JSP
+Summary(pl.UTF-8):     Tomcat - Zasobnik servletów/JSP
 Name:          jakarta-tomcat
 Version:       4.1.24
-%define                base_version 4.0
 Release:       4
 License:       Apache
 Group:         Development/Languages/Java
-Source0:       http://jakarta.apache.org/builds/%{name}-%{base_version}/release/v%{version}/src/%{name}-%{version}-src.tar.gz
+Source0:       http://jakarta.apache.org/builds/jakarta-tomcat-%{base_version}/release/v%{version}/src/%{name}-%{version}-src.tar.gz
 # Source0-md5: bdcdf1091ff942f378b1e6f402e44a67
-Source1:       http://jakarta.apache.org/builds/%{name}-%{base_version}/release/v%{version}/src/%{name}-connectors-%{version}-src.tar.gz
+Source1:       http://jakarta.apache.org/builds/jakarta-tomcat-%{base_version}/release/v%{version}/src/%{name}-connectors-%{version}-src.tar.gz
 # Source1-md5: 0daa701e51d04570006abce1ac580aed
 Source2:       %{name}.init
 Patch0:                %{name}-fixes.patch
@@ -16,65 +16,69 @@ Patch1:             %{name}-JAVA_HOME.patch
 Patch2:                %{name}-fileupload.patch
 URL:           http://jakarta.apache.org/tomcat/index.html
 # required:
-BuildRequires: jdk >= 1.2
-BuildRequires: jakarta-ant >= 1.5.3
-BuildRequires: jaxp_parser_impl
-BuildRequires: jakarta-servletapi >= 4
-BuildRequires: jakarta-commons-collections
+BuildRequires: ant >= 1.5.3
+BuildRequires: jaas
 BuildRequires: jakarta-commons-beanutils
+BuildRequires: jakarta-commons-collections
 BuildRequires: jakarta-commons-digester
-BuildRequires: jakarta-commons-logging
 BuildRequires: jakarta-commons-fileupload
+BuildRequires: jakarta-commons-logging
 BuildRequires: jakarta-regexp
-BuildRequires: jaas
+BuildRequires: jakarta-servletapi >= 4
+BuildRequires: jakarta-struts >= 1.0.2
+BuildRequires: jaxp_parser_impl
+BuildRequires: jdk >= 1.2
+BuildRequires: jpackage-utils
 BuildRequires: mx4j >= 1.1.1
 BuildRequires: puretls
-BuildRequires: jakarta-struts >= 1.0.2
+BuildRequires: rpmbuild(macros) >= 1.300
 # optional:
+BuildRequires: jaf >= 1.0.1
 BuildRequires: jakarta-commons-daemon
 BuildRequires: jakarta-commons-dbcp
 BuildRequires: jakarta-commons-modeler
 BuildRequires: jakarta-commons-pool
+BuildRequires: javamail >= 1.2
 BuildRequires: jdbc-stdext >= 2.0
 BuildRequires: jndi >= 1.2.1
-BuildRequires: jaf >= 1.0.1
-BuildRequires: javamail >= 1.2
 BuildRequires: jsse >= 1.0.2
 BuildRequires: jta >= 1.0.1
-BuildRequires: tyrex >= 1.0
 BuildRequires: junit >= 3.7
+BuildRequires: tyrex >= 1.0
 BuildRequires: xml-commons
-Requires:      jre >= 1.2
-Requires:      jakarta-servletapi >= 4
-Requires:      jakarta-commons-collections
+Requires(post,postun): /sbin/ldconfig
+Requires(post,preun):  /sbin/chkconfig
+Requires(postun):      /usr/sbin/groupdel
+Requires(postun):      /usr/sbin/userdel
+Requires(pre): /bin/id
+Requires(pre): /usr/bin/getgid
+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-digester
-Requires:      jakarta-commons-logging
 Requires:      jakarta-commons-fileupload
+Requires:      jakarta-commons-logging
 Requires:      jakarta-regexp
+Requires:      jakarta-servletapi >= 4
+Requires:      javamail >= 1.2
+Requires:      jaxp_parser_impl
 Requires:      jdbc-stdext >= 2.0
 Requires:      jndi >= 1.2.1
-Requires:      jaf >= 1.0.1
-Requires:      javamail >= 1.2
+Requires:      jre >= 1.2
 Requires:      jsse >= 1.0.2
 Requires:      jta >= 1.0.1
+Requires:      mx4j >= 1.1.1
 Requires:      tyrex >= 1.0
-Requires:      jaxp_parser_impl
 Requires:      xml-commons
-Requires:      jaas
-Requires:      mx4j >= 1.1.1
-Requires(pre): /usr/bin/getgid
-Requires(pre): /bin/id
-Requires(pre): /usr/sbin/groupadd
-Requires(pre): /usr/sbin/useradd
-Requires(postun):      /usr/sbin/userdel
-Requires(postun):      /usr/sbin/groupdel
-Requires(post,preun):  /sbin/chkconfig
-Requires(post,postun): /sbin/ldconfig
+Provides:      group(http)
+Provides:      user(http)
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _javalibdir     /usr/share/java
+%define                _javalibdir     %{_datadir}/java
 %define                _tomcatdir      %{_libdir}/tomcat
 %define        _logdir         %{_var}/log
 %define                _vardir         %{_var}/lib/tomcat
@@ -83,19 +87,19 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Tomcat 4.0, a server that implements the Servlet 2.3 and JSP 1.2
 Specifications from Java Software.
 
-%description -l pl
-Tomcat 4.0 - serwer implementuj±cy specyfikacje Servlet 2.3 oraz JSP
+%description -l pl.UTF-8
+Tomcat 4.0 - serwer implementujący specyfikacje Servlet 2.3 oraz JSP
 1.2.
 
 %package doc
 Summary:       The Tomcat Servlet/JSP Container documentation
-Summary(pl):   Dokumentacja do Tomcata
+Summary(pl.UTF-8):     Dokumentacja do Tomcata
 Group:         Development/Languages/Java
 
 %description doc
 The Tomcat Servlet/JSP Container documentation.
 
-%description doc -l pl
+%description doc -l pl.UTF-8
 Dokumentacja do Tomcata.
 
 %prep
@@ -106,8 +110,8 @@ Dokumentacja do Tomcata.
 
 %build
 CLASSPATH=%{_javalibdir}/xml-commons-apis.jar
-CLASSPATH=$CLASSPAHT:%{_javalibdir}/xalan.jar
-CLASSPATH=%{_javalibdir}/servlet.jar
+CLASSPATH=$CLASSPATH:%{_javalibdir}/xalan.jar
+CLASSPATH=$CLASSPATH:%{_javalibdir}/servlet.jar
 export CLASSPATH
 
 rm -f lib/*.jar
@@ -151,7 +155,7 @@ jaas.jar=%{_javalibdir}/jaas.jar
 tyrex.jar=%{_javalibdir}/tyrex.jar
 EOBP
 
-JAVA_HOME=/usr/lib/java
+JAVA_HOME=%{_libdir}/java
 ant -Djava.home=$JAVA_HOME
 
 %install
@@ -237,43 +241,23 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/tomcat
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-if [ -n "`getgid http`" ]; then
-       if [ "`getgid http`" != "51" ]; then
-               echo "Error: group http doesn't have gid=51. Correct this before installing tomcat." 1>&2
-               exit 1
-       fi
-else
-       /usr/sbin/groupadd -g 51 -r -f http
-fi
-if [ -n "`id -u http 2>/dev/null`" ]; then
-       if [ "`id -u http`" != "51" ]; then
-               echo "Error: user http doesn't have uid=51. Correct this before installing tomcat." 1>&2
-               exit 1
-       fi
-else
-       /usr/sbin/useradd -u 51 -r -d /home/services/httpd -s /bin/false -c "HTTP User" -g http http 1>&2
-fi
+%groupadd -g 51 -r -f http
+%useradd -u 51 -r -d /home/services/httpd -s /bin/false -c "HTTP User" -g http http
 
 %post
 /sbin/chkconfig --add tomcat
-if [ -f /var/lock/subsys/tomcat ]; then
-       /etc/rc.d/init.d/tomcat restart 1>&2
-else
-       echo "Run \"/etc/rc.d/init.d/tomcat start\" to start tomcat daemon."
-fi
+%service tomcat restart
 
 %preun
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/tomcat ]; then
-               /etc/rc.d/init.d/tomcat stop 1>&2
-       fi
+       %service tomcat stop
        /sbin/chkconfig --del tomcat
 fi
 
 %postun
 if [ "$1" = "0" ]; then
-       /usr/sbin/userdel http
-       /usr/sbin/groupdel http
+       %userremove http
+       %groupremove http
 fi
 
 %files
@@ -300,7 +284,7 @@ fi
 %{_tomcatdir}/temp
 # tomcat wants to regenerate tomcat-users.xml
 %attr(775,root,http) %dir %{_sysconfdir}/tomcat
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/tomcat/*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/tomcat/*
 %attr(754,root,root) /etc/rc.d/init.d/tomcat
 %dir %{_vardir}
 %attr(1730,root,http) %dir %{_vardir}/work
This page took 0.059454 seconds and 4 git commands to generate.