X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=apache-mod_jk.spec;h=6d91b68313b0828176c33a10a229ad51f088ea4d;hb=02bc7d07a7244582bfe1085a1444b341b5ca47bf;hp=0a242e2ece36b4d884a169de96538d893822dce4;hpb=e146d6f370b8cb4dd06346919114ada376c441d5;p=packages%2Fapache-mod_jk.git

diff --git a/apache-mod_jk.spec b/apache-mod_jk.spec
index 0a242e2..6d91b68 100644
--- a/apache-mod_jk.spec
+++ b/apache-mod_jk.spec
@@ -1,22 +1,34 @@
-%define 	apxs	/usr/sbin/apxs
+%define		_apache2	%(rpm -q apache-devel 2> /dev/null | grep -Eq '\\-2\\.[0-9]+\\.' && echo 1 || echo 0)
+%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}
-Version:	1.2.1
-Release:	1
+Version:	1.2.4
+Release:	0.1
 License:	Apache
 Group:		Networking/Daemons
-Source0:	http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v1.2.1/src/jakarta-tomcat-connectors-jk-%{version}-src.tar.gz
+Source0:	http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v%{version}/src/jakarta-tomcat-connectors-jk-%{version}-src.tar.gz
+# Source0-md5:	9641a826b87e64692377161215cfd5e1
 Source1:	%{name}.conf
 URL:		http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/doc/
-Prereq:		%{_sbindir}/apxs
 BuildRequires:	%{apxs}
-BuildRequires:	apache(EAPI)-devel	>= %{apache_version}
-BuildRequires:	jakarta-ant >= 1.5.1
-BuildRequires:	jakarta-tomcat
-Requires:	apache(EAPI)		>= %{apache_version}
+BuildRequires:	libtool
+BuildRequires:	automake
+BuildRequires:	autoconf
+BuildRequires:	perl-base
+%if %{_apache2}
+BuildRequires:  rpmbuild(macros) >= 1.120
+PreReq:         apache >= 2.0.40
+Requires:       apache(modules-api) = %{apache_modules_api}
+%else
+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
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	jakarta-tomcat-connectors-jk
 
@@ -37,59 +49,64 @@ Tomcat-Apache obs
 %setup -q -n jakarta-tomcat-connectors-jk-%{version}-src
 
 %build
-cd jk
+cd jk/native
 
 if [ -z "$JAVA_HOME" ]; then
         JAVA_HOME=/usr/lib/java
 fi
-ANT_HOME=%{_javalibdir}
-export JAVA_HOME ANT_HOME
-
-cat > build.properties << EOF
-#tomcat5.home=%{_libdir}/tomcat
-tomcat40.home=%{_tomcatdir}
-#tomcat41.home==%{_libdir}/tomcat
-#apache2.home=/opt/apache2
-apache13.home=%{_libdir}
-apr.home=\${apache2.home}
-apr.include=%{_includedir}/apache
-apr-util.include=%{_includedir}/apache
-apr.lib=%{_libdir}
-apr-util.lib=%{_libdir}
-#apache2.lib=%{_libdir}
-so.debug=false
-so.optimize=true
-so.profile=false
-EOF
-
-ant native
+export JAVA_HOME
+./buildconf.sh
+
+%configure \
+	--enable-EAPI \
+	--with-apxs=%{apxs} \
+	--with-java-home=${JAVA_HOME}
+
+%{__make} \
+	LIBTOOL=%{_bindir}/libtool
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd,/var/lock/mod_jk}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd/httpd.conf,/var/lock/mod_jk}
+
+cd jk/native
 
-install lib%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT \
+	APXS="%{apxs} -S LIBEXECDIR=$RPM_BUILD_ROOT$(%{apxs} -q LIBEXECDIR)" \
+	libexecdir=$RPM_BUILD_ROOT%{_pkglibdir}
+
+%if %{_apache2}
+echo "LoadModule jk_module	%{_pkglibdir}/mod_jk.so" > $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf/80_mod_jk.conf
+cat %{SOURCE1} >> $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf/80_mod_jk.conf
+%else
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/mod_jk.conf
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
+%if ! %{_apache2}
 %{apxs} -e -a -n %{mod_name} %{_pkglibdir}/lib%{mod_name}.so 1>&2
 if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*mod_jk.conf" /etc/httpd/httpd.conf; then
 	echo "Include /etc/httpd/mod_jk.conf" >> /etc/httpd/httpd.conf
 fi
+%endif
 if [ -f /var/lock/subsys/httpd ]; then
 	/etc/rc.d/init.d/httpd restart 1>&2
 fi
 
 %preun
 if [ "$1" = "0" ]; then
+%if ! %{_apache2}
 	%{apxs} -e -A -n %{mod_name} %{_pkglibdir}/lib%{mod_name}.so 1>&2
 	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
+%endif
 	if [ -f /var/lock/subsys/httpd ]; then
 		/etc/rc.d/init.d/httpd restart 1>&2
 	fi
@@ -97,7 +114,11 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc README CHANGES INSTALL LICENSE.html
+%doc jk/native/{README,CHANGES.txt} jk/docs/*
+%if %{_apache2}
+%config(noreplace) %{_sysconfdir}/httpd/httpd.conf/80_mod_jk.conf
+%else
 %config(noreplace) %{_sysconfdir}/httpd/mod_jk.conf
+%endif
 %attr(755,root,root) %{_pkglibdir}/*
 %attr(750,http,http) /var/lock/mod_jk