- up to 2.00

diff --git a/apache-mod_backtrace.spec b/apache-mod_backtrace.spec
index b239de732cb494731b8e504e02ceeeee66e21fd6..04773733f40950bf4a96ee1431d949e35adb8299 100644 (file)
--- a/apache-mod_backtrace.spec
+++ b/apache-mod_backtrace.spec
@@ -3,15 +3,17 @@
 Summary:       Apache module: collects backtraces on crashes
 Summary(pl.UTF-8):     Moduł Apache:  zbiera informacje o awariach
 Name:          apache-mod_%{mod_name}
-Version:       0.1
-Release:       0.20040317.6
+Version:       2.00
+Release:       1
 License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
-Source0:       http://people.apache.org/~trawick/mod_backtrace.c
-# Source0-md5: cd5361da31b3c1401e29ccb6e5220f6b
+Source0:       http://emptyhammock.com/downloads/wku_bt-%{version}.zip
+# Source0-md5: acc3f8497b0aabaad5c24d8d34d53ff1
+URL:           http://emptyhammock.com/projects/httpd/diag/
 BuildRequires: %{apxs}
 BuildRequires: apache-devel >= 2.0
 BuildRequires: rpmbuild(macros) >= 1.268
+Requires:      apache-mod_whatkilledus >= %{version}
 Requires:      apache(modules-api) = %apache_modules_api
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -29,34 +31,28 @@ rejestruje informacje o błędach w sytuacji kiedy proces potomny
 serwera apache ulegnie zniszczeniu.
 
 %prep
-%setup -q -c -T
-install %{SOURCE0} .
+%setup -q -n wku_bt-%{version}
 
 %build
-%{apxs} -c mod_%{mod_name}.c -o mod_%{mod_name}.la
+%{apxs} -c mod_%{mod_name}.c diag.c \
+%if "%{__lib}" == "lib64"
+          -DDIAG_BITS_64=1 \
+%endif
+          -o mod_%{mod_name}.la
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir},/var/log/httpd}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}}
 install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 
-touch $RPM_BUILD_ROOT/var/log/httpd/backtrace_log
 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/90_mod_%{mod_name}.conf << 'EOF'
 LoadModule %{mod_name}_module modules/mod_%{mod_name}.so
-EnableExceptionHook On
-BacktraceLog /var/log/httpd/backtrace_log
 EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-if [ ! -f /var/log/httpd/backtrace_log ]; then
-       :> /var/log/httpd/backtrace_log
-       chown root:http /var/log/httpd/backtrace_log
-       chmod 620 /var/log/httpd/backtrace_log
-fi
 %service -q httpd restart
 
 %postun
@@ -64,9 +60,10 @@ if [ "$1" = "0" ]; then
        %service -q httpd restart
 fi
 
+%triggerpostun -- %{name} < 2.00
+sed -i -e 's#^EnableExceptionHook.*##g' -e 's#BacktraceLog.*##g' %{_sysconfdir}/90_mod_%{mod_name}.conf
+
 %files
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*.so
-# open for append by webserver
-%attr(620,root,http) %ghost /var/log/httpd/backtrace_log