Author: glen Date: Mon Dec 26 23:59:24 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - unified, build fixes
---- Files affected: SPECS: apache-mod_jk.spec (1.30 -> 1.31) ---- Diffs: ================================================================ Index: SPECS/apache-mod_jk.spec diff -u SPECS/apache-mod_jk.spec:1.30 SPECS/apache-mod_jk.spec:1.31 --- SPECS/apache-mod_jk.spec:1.30 Mon Aug 15 20:44:28 2005 +++ SPECS/apache-mod_jk.spec Tue Dec 27 00:59:19 2005 @@ -1,8 +1,6 @@ # $Revision$, $Date$ # TODO: -# - fix looking for /usr/lib/apache/lib/apache/build/config_vars.mk.... # - logrotate file -# /TODO %define mod_name jk %define apxs /usr/sbin/apxs Summary: Apache module that handles communication between Tomcat and Apache @@ -15,6 +13,7 @@ Source0: http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-1.2.14/jakarta-tomcat-connectors-%{version}-src.tar.gz # Source0-md5: 41a90c633088e0f1ba422c10546a028a Source1: %{name}.conf +Patch0: %{name}-libtool.patch URL: http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/doc/ BuildRequires: %{apxs} BuildRequires: apache-devel >= 2.0.40 @@ -25,13 +24,12 @@ BuildRequires: libtool BuildRequires: perl-base BuildRequires: rpmbuild(macros) >= 1.120 -PreReq: apache >= 2.0.40 Requires: apache(modules-api) = %{apache_modules_api} Obsoletes: jakarta-tomcat-connectors-jk BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _pkglibdir %(%{apxs} -q LIBEXECDIR) -%define _sysconfdir %(%{apxs} -q SYSCONFDIR) +%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 @@ -44,6 +42,7 @@ %prep %setup -q -n jakarta-tomcat-connectors-%{version}-src +%patch0 -p1 %build cd jk/native @@ -53,8 +52,8 @@ fi export JAVA_HOME -# ugly speed hack -sed -i 's#`.*exp_installbuilddir`#/usr/lib/apache/build/#' configure.in +# temp hack for broken apxs (fixed in apache-apxs-2.2.0-6.1) +sed -i -e 's#`.*exp_installbuilddir`#%{_prefix}/lib/apache/build/#' configure.in ./buildconf.sh @@ -75,9 +74,7 @@ APXS="%{apxs} -S LIBEXECDIR=$RPM_BUILD_ROOT%{_pkglibdir}" \ libexecdir=$RPM_BUILD_ROOT%{_pkglibdir} -echo "LoadModule jk_module %{_pkglibdir}/mod_jk.so" > $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/80_mod_jk.conf -cat %{SOURCE1} >> $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/80_mod_jk.conf - +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/80_mod_jk.conf touch $RPM_BUILD_ROOT/var/log/httpd/mod_jk.log %clean @@ -103,9 +100,9 @@ %files %defattr(644,root,root,755) %doc jk/native/{README,CHANGES} -%config(noreplace) %{_sysconfdir}/httpd.conf/80_mod_jk.conf -%attr(755,root,root) %{_pkglibdir}/* -%attr(750,http,http) /var/lock/mod_jk +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf +%attr(755,root,root) %{_pkglibdir}/*.so +%attr(770,root,http) /var/lock/mod_jk %attr(640,root,logs) %ghost /var/log/httpd/mod_jk.log %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -114,6 +111,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.31 2005/12/26 23:59:19 glen +- unified, build fixes + Revision 1.30 2005/08/15 18:44:28 areq - 1.2.14.1 @@ -202,7 +202,7 @@ - adapterized Revision 1.2 2002/12/07 14:32:49 ankry -- fix improper usage of %%{_sysconfdir} +- fix improper usage of %{_sysconfdir} Revision 1.1 2002/11/26 23:20:36 misiek - unfinished (seems that tarball doesn't contain all required files) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/apache-mod_jk.spec?r1=1.30&r2=1.31&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
