SPECS: apache1-mod_jk.spec - update build and logfile from apache-...

[glen]

Author: glen                         Date: Sat Dec  8 18:39:10 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- update build and logfile from apache-mod_jk.spec

---- Files affected:
SPECS:
   apache1-mod_jk.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: SPECS/apache1-mod_jk.spec
diff -u SPECS/apache1-mod_jk.spec:1.19 SPECS/apache1-mod_jk.spec:1.20
--- SPECS/apache1-mod_jk.spec:1.19	Sun Nov  4 20:18:49 2007
+++ SPECS/apache1-mod_jk.spec	Sat Dec  8 19:39:05 2007
@@ -6,7 +6,7 @@
 Name:		apache1-mod_%{mod_name}
 Version:	1.2.25
 Release:	1
-License:	Apache
+License:	Apache License 2.0
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/tomcat-connectors-%{version}-src.tar.gz
 # Source0-md5:	4f614130c85f86d8d3359a03230db8a3
@@ -15,9 +15,10 @@
 BuildRequires:	apache1-devel >= 1.3.39
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	jpackage-utils
 BuildRequires:	libtool
 BuildRequires:	perl-base
-BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	apache1-mod_dir >= 1.3.33-2
 Obsoletes:	jakarta-tomcat-connectors-jk
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -39,29 +40,34 @@
 
 %build
 cd native
-
-./buildconf.sh
-
+%{__libtoolize}
+%{__aclocal}
+%{__autoheader}
+%{__automake}
+%{__autoconf}
 %configure \
 	--enable-EAPI \
-	--with-apxs=%{apxs}
-
+	--with-apxs=%{apxs} \
+	--with-java-home="%{java_home}"
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d,/var/lock/mod_jk}
-
-cd native
-
-install apache-1.3/mod_%{mod_name}.so.0.0.0 $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d,/var/{lock/mod_jk,log/apache}}
 
+install native/apache-1.3/mod_%{mod_name}.so.0.0.0 $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_%{mod_name}.conf
+touch $RPM_BUILD_ROOT/var/log/apache/mod_jk.log
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+if [ ! -f /var/log/apache/mod_jk.log ]; then
+	umask 027
+	touch /var/log/apache/mod_jk.log
+	chown root:logs /var/log/apache/mod_jk.log
+fi
 %service -q apache restart
 
 %postun
@@ -74,7 +80,8 @@
 %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
+%attr(770,root,http) /var/lock/mod_jk
+%attr(640,root,logs) %ghost /var/log/apache/mod_jk.log
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -82,6 +89,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2007-12-08 18:39:05  glen
+- update build and logfile from apache-mod_jk.spec
+
 Revision 1.19  2007-11-04 19:18:49  glen
 - apxs1 in apache1-devel now
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache1-mod_jk.spec?r1=1.19&r2=1.20&f=u