- 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 0e568db20a95b7647161199f6acf47f824663419..5d5ad635a42b5e27c8b391e572042475ff3e4126 100644 (file)
--- a/apache1-mod_jk.spec
+++ b/apache1-mod_jk.spec
@@ -1,51 +1,43 @@
+%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
-%define                mod_name        jk
+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.5
-Release:       0.2
+Version:       1.2.25
+Release:       1
 License:       Apache
 Group:         Networking/Daemons
-#Source0:      http://sunsite.icm.edu.pl/pub/www/apache/dist/jakarta/tomcat-connectors/jk/source/jakarta-tomcat-connectors-jk-%{version}-src.tar.gz
-Source0:       jakarta-tomcat-connectors-jk-1.2.5-src-20040516.tar.bz2
-# Source0-md5: 78d615f54e49e96ab4a5e9e442b88f9b
+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: libtool
-BuildRequires: automake
+BuildRequires: apache1-devel >= 1.3.39
 BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
 BuildRequires: perl-base
-PreReq:                apache(EAPI) < 2.0.0
-PreReq:                apache(EAPI) >= 1.3.9
-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)
-%define                _apacheconfdir  %(%{apxs} -q SYSCONFDIR)
-%define                _apacheconf     %{_apacheconfdir}/apache.conf
+%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 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-jk-%{version}-src
-%patch0 -p1
+%setup -q -n tomcat-connectors-%{version}-src
 
 %build
-cd jk/native
+cd native
 
 ./buildconf.sh
 
@@ -57,44 +49,28 @@ cd jk/native
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_apacheconf},/var/lock/mod_jk}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d,/var/lock/mod_jk}
 
-cd jk/native
+cd native
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       APXS="%{apxs} -S LIBEXECDIR=$RPM_BUILD_ROOT$(%{apxs} -q LIBEXECDIR)" \
-       libexecdir=$RPM_BUILD_ROOT%{_pkglibdir}
+install apache-1.3/mod_%{mod_name}.so.0.0.0 $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_apacheconfdir}/mod_jk.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{apxs} -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-if [ -f %{_apacheconf} ] && ! grep -q "^Include.*mod_jk.conf" %{_apacheconf}; then
-       echo "Include /etc/apache/mod_jk.conf" >> %{_apacheconf}
-fi
-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
-       %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-       umask 027
-       grep -v "^Include.*mod_jk.conf" %{_apacheconf} > \
-               %{_apacheconf}.tmp
-       mv -f %{_apacheconf}.tmp %{_apacheconf}
-       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} jk/doc/*
-%config(noreplace) %{_apacheconfdir}/mod_jk.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