- apxs1 in apache1-devel now

[packages/apache1-mod_jk.git] / apache1-mod_jk.spec

diff --git a/apache1-mod_jk.spec b/apache1-mod_jk.spec
index 7e9164dc5aaee59be974d7ba6764353927ad4309..5d5ad635a42b5e27c8b391e572042475ff3e4126 100644 (file)
--- a/apache1-mod_jk.spec
+++ b/apache1-mod_jk.spec
@@ -1,30 +1,25 @@
 %define                mod_name        jk
 %define                apxs            /usr/sbin/apxs1
 Summary:       Apache module that handles communication between Tomcat and Apache 1.3.x
-Summary(pl):   Modu³ Apache'a obs³uguj±cy komunikacjê miêdzy Tomcatem a Apachem 1.3.x
+Summary(pl.UTF-8):     Moduł Apache'a obsługujący komunikację między Tomcatem a Apachem 1.3.x
 Name:          apache1-mod_%{mod_name}
-Version:       1.2.8
-Release:       1.1
+Version:       1.2.25
+Release:       1
 License:       Apache
 Group:         Networking/Daemons
-Source0:       http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-%{version}/jakarta-tomcat-connectors-%{version}-src.tar.gz
-# Source0-md5: eb579c47f8dd71e526d7561c919ce06d
+Source0:       http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/tomcat-connectors-%{version}-src.tar.gz
+# Source0-md5: 4f614130c85f86d8d3359a03230db8a3
 Source1:       %{name}.conf
-Patch0:                jakarta-tomcat-connectors-jk-jkpass.patch
 URL:           http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/doc/
-BuildRequires: %{apxs}
-BuildRequires: apache1-devel >= 1.3.33-2
-BuildRequires: libtool
-BuildRequires: automake
+BuildRequires: apache1-devel >= 1.3.39
 BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
 BuildRequires: perl-base
-Requires:      apache1 >= 1.3.33-2
-Requires(post,preun):  %{apxs}
-Requires(post,preun):  %{__perl}
-Requires(post,preun):  grep
-Requires(preun):       fileutils
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRequires: rpmbuild(macros) >= 1.268
+Requires:      apache1-mod_dir >= 1.3.33-2
 Obsoletes:     jakarta-tomcat-connectors-jk
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
 %define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
@@ -34,16 +29,15 @@ 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.
+%description -l pl.UTF-8
+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-%{version}-src
-%patch0 -p1
+%setup -q -n tomcat-connectors-%{version}-src
 
 %build
-cd jk/native
+cd native
 
 ./buildconf.sh
 
@@ -57,7 +51,7 @@ cd jk/native
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d,/var/lock/mod_jk}
 
-cd jk/native
+cd native
 
 install apache-1.3/mod_%{mod_name}.so.0.0.0 $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so
 
@@ -67,20 +61,16 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_%{mod_name}.conf
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/apache ]; then
-       /etc/rc.d/init.d/apache restart 1>&2
-fi
+%service -q apache restart
 
-%preun
+%postun
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/apache ]; then
-               /etc/rc.d/init.d/apache restart 1>&2
-       fi
+       %service -q apache restart
 fi
 
 %files
 %defattr(644,root,root,755)
-%doc jk/native/{README,CHANGES.txt} doc/*
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
+%doc native/{CHANGES,README} docs/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*
 %attr(750,http,http) /var/lock/mod_jk