From: Elan Ruusamäe <glen@pld-linux.org>
Date: Tue, 3 Feb 2009 08:25:56 +0000 (+0000)
Subject: - no httpd.conf dir provided in th; rel 6
X-Git-Tag: auto/th/apache-mod_watch-4_03-6
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapache-mod_watch.git;a=commitdiff_plain;h=dd275cb6b5a8f422019734b4bd92f97d5c33f930

- no httpd.conf dir provided in th; rel 6

Changed files:
    apache-mod_watch.spec -> 1.35
---

diff --git a/apache-mod_watch.spec b/apache-mod_watch.spec
index feaaf23..2a1b920 100644
--- a/apache-mod_watch.spec
+++ b/apache-mod_watch.spec
@@ -7,7 +7,7 @@ Summary:	Apache module: Monitoring Interface for MRTG
 Summary(pl.UTF-8):	Moduł do apache: Interfejs do monitorowania za pomocą MRTG
 Name:		apache-mod_%{mod_name}
 Version:	4.03
-Release:	5
+Release:	6
 License:	BSD
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.snert.com/Software/download/mod_watch%(echo %{version} | tr -d .).tgz
@@ -23,7 +23,7 @@ Requires:	apache(modules-api) = %apache_modules_api
 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
 This module will watch and collect the bytes, requests, and documents
@@ -52,11 +52,11 @@ wspiera mod_vhost_alias oraz mod_gzip.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_bindir},%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_bindir},%{_sysconfdir}}
 
 install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 install apache2mrtg.pl mod_watch.pl $RPM_BUILD_ROOT%{_bindir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/99_mod_watch.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/99_mod_watch.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -72,6 +72,6 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc CHANGES* *html *.txt Contrib nfields.pl
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_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(755,root,root) %{_bindir}/*