- use conf.d for apache config fragment; rel 2

Changed files:
    apache-mod_cband.spec -> 1.24

diff --git a/apache-mod_cband.spec b/apache-mod_cband.spec
index 1850beb68a645fe0d6c7db4003932dbbfc225142..14f371a671410dcf27081d67778a53cc8b8ccdbc 100644 (file)
--- a/apache-mod_cband.spec
+++ b/apache-mod_cband.spec
@@ -4,7 +4,7 @@ Summary:        Apache module: bandwidth limits per vhosts
 Summary(pl.UTF-8):     Moduł do Apache: limity pasma dla poszczególnych vhostów
 Name:          apache-mod_%{mod_name}
 Version:       0.9.7.5
-Release:       1
+Release:       2
 License:       Apache
 Group:         Networking/Daemons
 Source0:       http://cband.linux.pl/download/mod-%{mod_name}-%{version}.tgz
@@ -19,8 +19,8 @@ Requires:     crondaemon
 Requires:      procps
 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                apacheconfdir   %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
+%define                apachelibdir    %(%{apxs} -q LIBEXECDIR 2>/dev/null)
 
 %description
 mod_cband is an Apache 2 module provided to solve the problem of
@@ -44,10 +44,10 @@ strony wskazanej w pliku konfiguracyjnym.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{apachelibdir},%{apacheconfdir}}
 
-install src/.libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/97_mod_%{mod_name}.conf
+install src/.libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{apachelibdir}
+install %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/97_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -63,5 +63,5 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS Changes INSTALL conf/*.example
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*mod_*.conf
-%attr(755,root,root) %{_pkglibdir}/*.so
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*mod_*.conf
+%attr(755,root,root) %{apachelibdir}/*.so