packages: apache-mod_jk/apache-mod_jk.spec - install workers.properties file

[pawelz]

Author: pawelz                       Date: Tue Nov 24 08:31:10 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- install workers.properties file

---- Files affected:
packages/apache-mod_jk:
   apache-mod_jk.spec (1.56 -> 1.57) 

---- Diffs:

================================================================
Index: packages/apache-mod_jk/apache-mod_jk.spec
diff -u packages/apache-mod_jk/apache-mod_jk.spec:1.56 packages/apache-mod_jk/apache-mod_jk.spec:1.57
--- packages/apache-mod_jk/apache-mod_jk.spec:1.56	Fri Apr 24 00:46:27 2009
+++ packages/apache-mod_jk/apache-mod_jk.spec	Tue Nov 24 09:31:04 2009
@@ -13,6 +13,7 @@
 Source0:	http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/tomcat-connectors-%{version}-src.tar.gz
 # Source0-md5:	db3990a95d0a9a874e798f305c91931c
 Source1:	%{name}.conf
+Source2:	%{name}-workers.properties
 Patch0:		%{name}-apxs.patch
 Patch1:		%{name}-libtool.patch
 URL:		http://tomcat.apache.org/connectors-doc/
@@ -30,7 +31,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)/conf.d
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 JK is a replacement to the elderly mod_jserv. It was a completely new
@@ -60,12 +61,13 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir},/var/{lock/mod_jk,log/httpd}}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d,/var/{lock/mod_jk,log/httpd}}
 
 %{__make} -C native install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/80_mod_jk.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/80_mod_jk.conf
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/workers.properties
 touch $RPM_BUILD_ROOT/var/log/httpd/mod_jk.log
 
 %clean
@@ -87,7 +89,8 @@
 %files
 %defattr(644,root,root,755)
 %doc native/{README.txt,CHANGES,NEWS}
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
+%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}/workers.properties
 %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
@@ -98,6 +101,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.57  2009/11/24 08:31:04  pawelz
+- install workers.properties file
+
 Revision 1.56  2009/04/23 22:46:27  glen
 - -libtool.patch for ccache build
 
================================================================

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