SPECS: apache-mod_jk.spec - template-apache_module.spec

[glen]

Author: glen                         Date: Sat Dec  6 15:31:55 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- template-apache_module.spec

---- Files affected:
SPECS:
   apache-mod_jk.spec (1.52 -> 1.53) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_jk.spec
diff -u SPECS/apache-mod_jk.spec:1.52 SPECS/apache-mod_jk.spec:1.53
--- SPECS/apache-mod_jk.spec:1.52	Sat Dec  6 16:13:26 2008
+++ SPECS/apache-mod_jk.spec	Sat Dec  6 16:31:49 2008
@@ -16,7 +16,7 @@
 Patch0:		%{name}-apxs.patch
 URL:		http://tomcat.apache.org/connectors-doc/
 BuildRequires:	%{apxs}
-BuildRequires:	apache-devel >= 2.2.10
+BuildRequires:	apache-devel >= 2.2
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	jpackage-utils
@@ -29,7 +29,7 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
-%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
 
 %description
 JK is a replacement to the elderly mod_jserv. It was a completely new
@@ -58,12 +58,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d,/var/{lock/mod_jk,log/httpd}}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir},/var/{lock/mod_jk,log/httpd}}
 
 %{__make} -C native install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/80_mod_jk.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/80_mod_jk.conf
 touch $RPM_BUILD_ROOT/var/log/httpd/mod_jk.log
 
 %clean
@@ -85,7 +85,7 @@
 %files
 %defattr(644,root,root,755)
 %doc native/{README.txt,CHANGES,NEWS}
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_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
@@ -96,6 +96,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53  2008/12/06 15:31:49  glen
+- template-apache_module.spec
+
 Revision 1.52  2008/12/06 15:13:26  areq
 - 1.2.27
 
================================================================

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