- pl description

- s/mod_dav/mod_jk/g
- set umask before grep -v

Changed files:
    apache-mod_jk.spec -> 1.4

diff --git a/apache-mod_jk.spec b/apache-mod_jk.spec
index e262e8890c66adae660d53b59ef7fbfd2a78083f..d964130ffcb6d83e7b40d0ce5677c86f8703b370 100644 (file)
--- a/apache-mod_jk.spec
+++ b/apache-mod_jk.spec
@@ -1,5 +1,6 @@
 %define        apxs    /usr/sbin/apxs
 Summary:       Apache module that handles communication between Tomcat and Apache
+Summary(pl):   Modu³ Apache'a obs³uguj±cy komunikacjê miêdzy Tomcatem a Apachem
 %define                apache_version  1.3.27
 %define                mod_name        jk
 Name:          apache-mod_%{mod_name}
@@ -28,6 +29,10 @@ JK is a replacement to the elderly mod_jserv. It was a completely new
 Tomcat-Apache plug-in that handles the communication between Tomcat
 and Apache.
 
+%description -l pl
+JK jest zamiennikiem starego mod_jserv. Jest ca³kowicie now± wtyczk±
+Tomcat-Apache obs³uguj±c± komunikacjê miêdzy Tomcatem a Apachem.
+
 %prep
 %setup -q -n jakarta-tomcat-connectors-jk-%{version}-src
 
@@ -35,7 +40,7 @@ and Apache.
 cd jk
 
 if [ -z "$JAVA_HOME" ]; then
-        JAVA_HOME=%{_libdir}/java
+        JAVA_HOME=/usr/lib/java
 fi
 ANT_HOME=%{_javalibdir}
 export JAVA_HOME ANT_HOME
@@ -61,15 +66,18 @@ ant native
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd,/var/lock/mod_dav}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd,/var/lock/mod_jk}
+
+install lib%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/mod_jk.conf
 
-install lib%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}/
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/mod_dav.conf
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %post
 %{apxs} -e -a -n %{mod_name} %{_pkglibdir}/lib%{mod_name}.so 1>&2
 if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*mod_dav.conf" /etc/httpd/httpd.conf; then
-       echo "Include /etc/httpd/mod_dav.conf" >> /etc/httpd/httpd.conf
+       echo "Include /etc/httpd/mod_jk.conf" >> /etc/httpd/httpd.conf
 fi
 if [ -f /var/lock/subsys/httpd ]; then
        /etc/rc.d/init.d/httpd restart 1>&2
@@ -78,7 +86,8 @@ fi
 %preun
 if [ "$1" = "0" ]; then
        %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/lib%{mod_name}.so 1>&2
-       grep -v "^Include.*mod_dav.conf" /etc/httpd/httpd.conf > \
+       umask 027
+       grep -v "^Include.*mod_jk.conf" /etc/httpd/httpd.conf > \
                /etc/httpd/httpd.conf.tmp
        mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf
        if [ -f /var/lock/subsys/httpd ]; then
@@ -86,12 +95,9 @@ if [ "$1" = "0" ]; then
        fi
 fi
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(644,root,root,755)
 %doc README CHANGES INSTALL LICENSE.html
-%config(noreplace) %{_sysconfdir}/httpd/mod_dav.conf
+%config(noreplace) %{_sysconfdir}/httpd/mod_jk.conf
 %attr(755,root,root) %{_pkglibdir}/*
-%attr(750,http,http) /var/lock/mod_dav
+%attr(750,http,http) /var/lock/mod_jk