From 859ff54a9614bc8967c73e7814b6833b4d8e7a90 Mon Sep 17 00:00:00 2001
From: radek <radek@pld-linux.org>
Date: Sun, 5 Sep 2004 16:39:02 +0000
Subject: [PATCH] - cp apache{,1}-*; version 3.18; unifications

Changed files:
    apache1-mod_watch.spec -> 1.14
---
 apache1-mod_watch.spec | 49 ++++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/apache1-mod_watch.spec b/apache1-mod_watch.spec
index be8c55d..c317271 100644
--- a/apache1-mod_watch.spec
+++ b/apache1-mod_watch.spec
@@ -1,26 +1,28 @@
 %define		mod_name	watch
-%define 	apxs		/usr/sbin/apxs
+%define 	apxs		/usr/sbin/apxs1
 Summary:	Apache module: Monitoring Interface for MRTG
 Summary(pl):	Modu³ do apache: Interfejs do monitorowania za pomoc± MRTG
-Name:		apache-mod_%{mod_name}
-Version:	3.13
-Release:	3
+Name:		apache1-mod_%{mod_name}
+Version:	3.18
+Release:	1
 License:	BSD
 Group:		Networking/Daemons
-Source0:	http://www.snert.com/Software/mod_watch/mod_watch%(echo %{version} | tr -d .).tgz
-# Source0-md5:	89ca8cee3315d8073359d47104583aee
+Source0:	http://www.snert.com/Software/download/mod_watch%(echo %{version} | tr -d .).tgz
+# Source0-md5:	1409df800f24214bed16ca753b9967ff
 Source1:	%{name}.conf
 Patch0:		%{name}-PLD-v6stuff.patch
 URL:		http://www.snert.com/Software/mod_watch/
 BuildRequires:	%{apxs}
-BuildRequires:	apache(EAPI)-devel
+BuildRequires:	apache1-devel
 Requires(post,preun):	%{apxs}
 Requires(post,preun):	grep
 Requires(preun):	fileutils
-Requires:	apache(EAPI)
+Requires:	apache1
+Obsoletes:	apache-mod_%{mod_name} <= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR)
+%define		_sysconfdir	/etc/apache
 
 %description
 This module will watch and collect the bytes, requests, and documents
@@ -43,14 +45,15 @@ graficzn
 %patch -p0
 
 %build
-%{__make} build-dynamic
+%{__make} build-dynamic \
+	APXS=%{apxs}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}}
 
 install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/mod_watch.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mod_watch.conf
 
 mv mod_watch.html mod_watch_pl.html
 sed -e 's/<!--#/<!--/g' index.shtml > mod_watch.html
@@ -60,25 +63,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %{apxs} -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-if [ -f %{_sysconfdir}/httpd/httpd.conf ] && \
-    ! grep -q "^Include.*mod_watch.conf" %{_sysconfdir}/httpd/httpd.conf; then
-	echo Include %{_sysconfdir}/httpd/mod_watch.conf >> %{_sysconfdir}/httpd/httpd.conf
+if [ -f %{_sysconfdir}/apache/apache.conf ] && \
+    ! grep -q "^Include.*mod_watch.conf" %{_sysconfdir}/apache/apache.conf; then
+	echo Include %{_sysconfdir}/apache/mod_watch.conf >> %{_sysconfdir}/apache/apache.conf
 fi
-if [ -f /var/lock/subsys/httpd ]; then
-	/etc/rc.d/init.d/httpd restart 1>&2
+if [ -f /var/lock/subsys/apache ]; then
+	/etc/rc.d/init.d/apache restart 1>&2
 else
-	echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+	echo "Run \"/etc/rc.d/init.d/apache start\" to start apache http daemon."
 fi
 
 %preun
 if [ "$1" = "0" ]; then
 	%{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
 	umask 027
-	grep -v "^Include.*mod_watch.conf" %{_sysconfdir}/httpd/httpd.conf > \
-		%{_sysconfdir}/httpd/httpd.conf.tmp
-	mv -f %{_sysconfdir}/httpd/httpd.conf.tmp /etc/httpd/httpd.conf
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd restart 1>&2
+	grep -v "^Include.*mod_watch.conf" %{_sysconfdir}/apache/apache.conf > \
+		%{_sysconfdir}/apache/apache.conf.tmp
+	mv -f %{_sysconfdir}/apache/apache.conf.tmp /etc/apache/apache.conf
+	if [ -f /var/lock/subsys/apache ]; then
+		/etc/rc.d/init.d/apache restart 1>&2
 	fi
 fi
 
@@ -86,4 +89,4 @@ fi
 %defattr(644,root,root,755)
 %doc CHANGES* *.html
 %attr(755,root,root) %{_pkglibdir}/*
-%{_sysconfdir}/httpd/mod_watch.conf
+%{_sysconfdir}/mod_watch.conf
-- 
2.43.0