- template-apache_module.spec

Changed files:
    apache-mod_jk.spec -> 1.53

diff --git a/apache-mod_jk.spec b/apache-mod_jk.spec
index b007e0833609bc069345d3f3c16ba4fcff71c6b8..3485a4e979cdde0b91b8f8de97cce032ad5944ce 100644 (file)
--- a/apache-mod_jk.spec
+++ b/apache-mod_jk.spec
@@ -15,7 +15,7 @@ Source1:      %{name}.conf
 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
@@ -28,7 +28,7 @@ Obsoletes:    jakarta-tomcat-connectors-jk
 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
@@ -57,12 +57,12 @@ cd native
 
 %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
@@ -84,7 +84,7 @@ fi
 %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