# TODO
# - package -DSTATEDIR=/var/lib/mod_watch ?
%define mod_name watch
-%define apxs /usr/sbin/apxs
-%include /usr/lib/rpm/macros.perl
+%define apxs /usr/sbin/apxs
Summary: Apache module: Monitoring Interface for MRTG
-Summary(pl.UTF-8): Moduł do apache: Interfejs do monitorowania za pomocą 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: 9
License: BSD
-Group: Networking/Daemons
+Group: Networking/Daemons/HTTP
Source0: http://www.snert.com/Software/download/mod_watch%(echo %{version} | tr -d .).tgz
# Source0-md5: 06d57713adb935f16596d22256bca913
Source1: %{name}.conf
Patch0: %{name}-apr-fix.patch
+Patch1: %{name}-shm-fix.patch
+Patch2: %{name}-mutex.patch
+Patch3: %{name}-apache24.patch
URL: http://www.snert.com/Software/mod_watch/
BuildRequires: %{apxs}
BuildRequires: apache-devel >= 2.0.52-2
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
%prep
%setup -q -n mod_%{mod_name}-4.3
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
%{__make} -f Makefile.dso build \
%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
%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}/*