- added config

Changed files:
    apache1-mod_accounting.spec -> 1.6

diff --git a/apache1-mod_accounting.spec b/apache1-mod_accounting.spec
index 8b8cabd0d3e13b218738578af27e0427dd8a7ba8..812c1e927dc15db441eb8d2305ccd78c2599a517 100644 (file)
--- a/apache1-mod_accounting.spec
+++ b/apache1-mod_accounting.spec
@@ -1,49 +1,55 @@
 %define                mod_name        accounting
 %define        apxs            /usr/sbin/apxs
-Summary:       Apache module: records traffic statistics into a database
-Summary(pl):   Modu³ do apache: zapisuje statystyki ruchu do relacyjnej bazy danych
+Summary:       Apache module: record traffic statistics into a database
+Summary(pl):   Modu³ do apache: zapisuje statystyki ruchu do bazy danych
 Name:          apache-mod_%{mod_name}
 Version:       0.4
 Release:       1
-License:       GPL
+License:       BSD
 Group:         Networking/Daemons
-Source0:       http://prdownloads.sourceforge.net/mod-acct/mod_%{mod_name}-%{version}.tar.gz
+Source0:       http://prdownloads.sourceforge.net/mod-acct/mod_accounting-%{version}.tar.gz
+Source1:       %{name}.conf
 URL:           http://sourceforge.net/projects/mod-acct/
 BuildRequires: %{apxs}
-BuildRequires: apache-devel
-BuildRequires: zlib-devel
+BuildRequires: apache(EAPI)-devel
 Prereq:                %{_sbindir}/apxs
-Requires:      apache
+Requires:      apache(EAPI)
+BuildRequires: postgresql-devel
+BuildRequires: mysql-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
+%define         _sysconfdir     /etc/httpd
 
 %description
 mod_accounting is a simple Apache module that can record traffic
-statistics into a database (bytes in/out per http request).
+statistics into a database (bytes in/out per http request)
 
 %description -l pl
-mod_accounting jest prostym modu³em Apacza, s³u¿±cym do zapisywania
-statystyk ruchu do relacyjnej bazy danych (ilo¶æ bajtów
-wchodz±cych/wychodz±cych na ¿±danie http)
+mod_accounting to prosty modu³ Apache pozwalaj±cy na zapisywanie
+informacji o ruchu http do bazy danych (bajty
+przychodz±ce/wychodz±ce).
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
 
 %build
-%{apxs} -c mod_%{mod_name}.c -o mod_%{mod_name}.so -lz
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_pkglibdir}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}}
 
 install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mod_accounting.conf
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+gzip -9nf README ChangeLog
 
 %post
 %{_sbindir}/apxs -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
+if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*mod_accounting.conf" /etc/httpd/httpd.conf; then
+        echo "Include /etc/httpd/mod_accounting.conf" >> /etc/httpd/httpd.conf
+fi
 if [ -f /var/lock/subsys/httpd ]; then
        /etc/rc.d/init.d/httpd restart 1>&2
 fi
@@ -51,11 +57,18 @@ fi
 %preun
 if [ "$1" = "0" ]; then
        %{_sbindir}/apxs -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
+        grep -v -q "^Include.*mod_accounting.conf" /etc/httpd/httpd.conf > \
+                /etc/httpd/httpd.conf.tmp
+        mv -f /etc/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
 fi
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %files
 %defattr(644,root,root,755)
+%doc *.gz
 %attr(755,root,root) %{_pkglibdir}/*