X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapache-mod_dosevasive.git;a=blobdiff_plain;f=apache-mod_dosevasive.spec;h=3d87dce07a868d606fa2b4c0f6ed47d553f95f3d;hp=dd7f2e41a25fbf771e561a3fac69ba82ae216e53;hb=22275acaaaa5d99e07a3bba2c989c5892a065992;hpb=0ac5270fde9f2cd59445b8b6f1ed850084aea2cc

diff --git a/apache-mod_dosevasive.spec b/apache-mod_dosevasive.spec
index dd7f2e4..3d87dce 100644
--- a/apache-mod_dosevasive.spec
+++ b/apache-mod_dosevasive.spec
@@ -1,27 +1,34 @@
-%define		mod_name	dosevasive
+# TODO: change spac name to apache-mod_evasive.spec as it is now official name
+# see http://www.nuclearelephant.com/projects/dosevasive/
+%define		mod_name	evasive
 %define 	apxs		/usr/sbin/apxs
 Summary:	Apache DoS Evasive Maneuvers Module
 Summary(pl):	Modu³ manewrów omijaj±cych ataki DoS dla Apache
 Name:		apache-mod_%{mod_name}
-Version:	1.10
+Version:	1.10.1
 Release:	1
 License:	GPL v2+
 Group:		Networking/Daemons
-Source0:	http://www.nuclearelephant.com/projects/dosevasive/mod_%{mod_name}_%{version}.tar.gz
-# Source0-md5:	5e5eee54b3fba64c83898828693931ff
+Source0:	http://www.nuclearelephant.com/projects/mod_evasive/mod_%{mod_name}_%{version}.tar.gz
+# Source0-md5:	784fca4a124f25ccff5b48c7a69a65e5
 Source1:	%{name}.conf
-URL:		http://www.nuclearelephant.com/projects/dosevasive/
+URL:		http://www.nuclearelephant.com/projects/mod_evasive/
 BuildRequires:	%{apxs}
-BuildRequires:	apache-devel >= 2
+BuildRequires:	apache-devel >= 2.0
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	zlib-devel
-Requires(post,preun):	%{apxs}
-Requires:	apache >= 2
+Obsoletes:      apache-mod_dosevasive
+Provides:       apache-mod_dosevasive
+Requires:	apache(modules-api) = %apache_modules_api
+
+
 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
-mod_dosevasive is an evasive maneuvers module for Apache to provide
+mod_(dos)evasive is an evasive maneuvers module for Apache to provide
 evasive action in the event of an HTTP DoS or DDoS attack or brute
 force attack. It is also designed to be a detection and network
 management tool, and can be easily configured to talk to ipchains,
@@ -29,7 +36,7 @@ firewalls, routers, and etcetera. mod_dosevasive presently reports
 abuses via email and syslog facilities.
 
 %description -l pl
-mod_dosevasive to modu³ manewrów omijaj±cych dla Apache, zapewniaj±cy
+mod_(dos)evasive to modu³ manewrów omijaj±cych dla Apache, zapewniaj±cy
 akcje omijaj±ce w przypadku ataków DoS, DDoS lub brute force na us³ugê
 HTTP. Zosta³ zaprojektowany tak¿e jako narzêdzie do wykrywania i
 zarz±dzania sieci±, mo¿e byæ ³atwo skonfigurowany do wspó³pracy z
@@ -45,30 +52,24 @@ nadu
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_pkglibdir}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 
 install .libs/mod_%{mod_name}20.so $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf/80_%{mod_name}.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/80_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{apxs} -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-if [ -f /var/lock/subsys/httpd ]; then
-	/etc/rc.d/init.d/httpd restart 1>&2
-fi
+%service -q httpd restart
 
 %preun
 if [ "$1" = "0" ]; then
-	%{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd restart 1>&2
-	fi
+	%service -q httpd restart
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc README
-%attr(755,root,root) %{_pkglibdir}/*
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd/httpd.conf/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*.so