- rel 0.2 (because of new uid/gid)

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

diff --git a/apache-tomcat.spec b/apache-tomcat.spec
index 13f20532849b6f79e949f455af26fb3b66434447..50f622d561def9c45e0a0462f48b7b26a1a73a5c 100644 (file)
--- a/apache-tomcat.spec
+++ b/apache-tomcat.spec
@@ -8,7 +8,7 @@ Summary:        Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 Summary(pl.UTF-8):     Silnik Servlet/JSP Apache będący wzorcową implementacją API Servlet 2.4/JSP 2.0
 Name:          apache-tomcat
 Version:       5.5.27
-Release:       0.1
+Release:       0.2
 License:       Apache
 Group:         Development/Languages/Java
 Source0:       http://www.apache.org/dist/tomcat/tomcat-5/v%{version}/src/%{name}-%{version}-src.tar.gz
@@ -97,8 +97,8 @@ Requires:     jsse >= 1.0.2
 Requires:      jta >= 1.0.1
 Requires:      rc-scripts
 Requires:      xml-commons
-Provides:      group(http)
-Provides:      user(http)
+Provides:      group(tomcat)
+Provides:      user(tomcat)
 Obsoletes:     jakarta-tomcat
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -320,8 +320,8 @@ ln -sf $(find-jar struts-core) $TOMCATDIR/server/webapps/admin/WEB-INF/lib/strut
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-%groupadd -g 51 -r -f http
-%useradd -u 51 -r -d /home/services/httpd -s /bin/false -c "HTTP User" -g http http
+%groupadd -g 51 -r -f tomcat
+%useradd -u 51 -r -d /var/lib/tomcat -s /bin/false -c "Tomcat User" -g tomcat tomcat
 
 %post
 /sbin/chkconfig --add tomcat
@@ -335,8 +335,8 @@ fi
 
 %postun
 if [ "$1" = "0" ]; then
-       %userremove http
-       %groupremove http
+       %userremove tomcat
+       %groupremove tomcat
 fi
 
 %files
@@ -373,11 +373,11 @@ fi
 %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(775,root,http) %{_vardir}/webapps
-%dir %attr(775,root,http) %{_vardir}/temp
-%dir %attr(775,root,http) %{_logdir}/tomcat
+%config(noreplace) %attr(775,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf
+%dir %attr(1730,root,tomcat) %{_vardir}/work
+%dir %attr(775,root,tomcat) %{_vardir}/webapps
+%dir %attr(775,root,tomcat) %{_vardir}/temp
+%dir %attr(775,root,tomcat) %{_logdir}/tomcat
 %{_vardir}/logs
 
 %if 0