- BR s@%{apxs}@apache1-apxs@g

[packages/apache1-mod_watch.git] / apache1-mod_watch.spec

diff --git a/apache1-mod_watch.spec b/apache1-mod_watch.spec
index c0836c8bc5b0fedc89239202c395e0e802461546..fb7fa781b5cdaf747c78a3d7e30104821f6d2a41 100644 (file)
--- a/apache1-mod_watch.spec
+++ b/apache1-mod_watch.spec
@@ -1,23 +1,33 @@
+# TODO
+# - strange error when accessing "/~watch-info":
+#   [Thu Feb 10 03:16:16 2005] [warn] " 1\n\b" concurrency counter went negative; resetting to zero
+
+%bcond_without ipv6            # disable IPv6 support
+
 %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
+Summary(pl.UTF-8):     Moduł do apache: Interfejs do monitorowania za pomocą MRTG
+Name:          apache1-mod_%{mod_name}
+Version:       3.18
+Release:       4
 License:       BSD
 Group:         Networking/Daemons
-Source0:       http://www.snert.com/Software/mod_watch/mod_watch%(echo %{version} | sed -e "s#\.##g").tgz
+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
-Prereq:                %{_sbindir}/apxs
-Requires:      apache(EAPI)
+BuildRequires: apache1-apxs
+#{?with_ipv6:BuildRequires:    apache1(ipv6)-devel}
+BuildRequires: apache1-devel >= 1.3.33-2
+BuildRequires: rpmbuild(macros) >= 1.268
+Requires:      apache1(EAPI)
+Obsoletes:     apache-mod_watch <= 3.18
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
+%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 This module will watch and collect the bytes, requests, and documents
@@ -28,58 +38,60 @@ data, but is general enough that it can be applied to other purposes,
 as the raw data is accessed by a URL. This module supports
 mod_vhost_alias and mod_gzip.
 
-%description -l pl
-Ten modu³ kontroluje i zbiera informacje na temat ilo¶ci przes³anych
-bajtów (przychodz±cych i wychodz±cych) wg. serwera wirtualnego, w³a¶ciciela
-plików, zdalnego adresu ip, katalogu lub lokacji oraz serwera jako ca³o¶ci.
-Modu³ zosta³ zaprojektowany do pracy z MRTG, dziêki czemu otrzymamy ³adn±,
-graficzn± reprezentacje danych. Modu³ wspiera mod_vhost_alias oraz mod_gzip.
+%description -l pl.UTF-8
+Ten moduł kontroluje i zbiera informacje na temat ilości przesłanych
+bajtów (przychodzących i wychodzących) wg. serwera wirtualnego,
+właściciela plików, zdalnego adresu ip, katalogu lub lokacji oraz
+serwera jako całości. Moduł został zaprojektowany do pracy z MRTG,
+dzięki czemu otrzymamy ładną, graficzną reprezentacje danych. Moduł
+wspiera mod_vhost_alias oraz mod_gzip.
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
-%patch -p0
+%{?with_ipv6:%patch -p0}
+
+mv mod_watch.html mod_watch_pl.html
 
 %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}/conf.d}
 
 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}/conf.d/90_mod_%{mod_name}.conf
 
-mv mod_watch.html mod_watch_pl.html
 sed -e 's/<!--#/<!--/g' index.shtml > mod_watch.html
 
+%clean
+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
-fi
-if [ -f /var/lock/subsys/httpd ]; then
-       /etc/rc.d/init.d/httpd restart 1>&2
-else
-       echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
-fi
+%service -q apache restart
 
-%preun
+%postun
 if [ "$1" = "0" ]; then
-       %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-       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
-       fi
+       %service -q apache restart
 fi
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%triggerpostun -- %{name} < 3.18-1.1
+if grep -q '^Include conf\.d/\*\.conf' /etc/apache/apache.conf; then
+       %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
+       sed -i -e '
+               /^Include.*mod_%{mod_name}\.conf/d
+       ' /etc/apache/apache.conf
+else
+       # they're still using old apache.conf
+       sed -i -e '
+               s,^Include.*mod_%{mod_name}\.conf,Include %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf,
+       ' /etc/apache/apache.conf
+fi
+%service -q apache restart
 
 %files
 %defattr(644,root,root,755)
 %doc CHANGES* *.html
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*
-%{_sysconfdir}/httpd/mod_watch.conf