X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapache-mod_security.git;a=blobdiff_plain;f=apache-mod_security.spec;h=0c9e1c86f7c7d747166c6cec83b9377193c03fb6;hp=0a8d68b6797828cf18378ca228b7c76e3f22a60b;hb=b98265f690ddcb1293e8fe6f05e9192f7580950b;hpb=111383e70ba4489c9148f97c750f496656fb8a4d

diff --git a/apache-mod_security.spec b/apache-mod_security.spec
index 0a8d68b..0c9e1c8 100644
--- a/apache-mod_security.spec
+++ b/apache-mod_security.spec
@@ -1,23 +1,22 @@
 %define		mod_name	security
-%define 	apxs		%{_sbindir}/apxs
+%define 	apxs		/usr/sbin/apxs
 Summary:	Apache module: securing web applications
-Summary(pl):	Modu³ do apache: ochrona aplikacji webowych
+Summary(pl.UTF-8):   Moduł do apache: ochrona aplikacji WWW
 Name:		apache-mod_%{mod_name}
-Version:	1.8.6
-Release:	0.1
+Version:	1.9.4
+Release:	1
 License:	GPL v2
 Group:		Networking/Daemons
-######		/home/staff/mnx/zbyniu/rpm/SOURCES/rpm.groups: no such file
-Source0:	http://www.modsecurity.org/download/mod_security-%{version}.tar.gz
-# Source0-md5:	f6bf4724dd0db3d37586b64bc0ee160d
-URL:		http://sourceforge.net/projects/mod-acct/
+Source0:	http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.gz
+# Source0-md5:	74d2317781bab619cd7b6b376b978107
+URL:		http://www.modsecurity.org/
 BuildRequires:	apache-devel
-Requires(post,preun):	%{apxs}
-Requires:	apache
+BuildRequires:	rpmbuild(macros) >= 1.268
+Requires:	apache(modules-api) = %apache_modules_api
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR)
-%define		_sysconfdir     /etc/httpd
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 ModSecurity is an open source intrusion detection and prevention
@@ -25,13 +24,13 @@ engine for web applications. It operates embedded into the web server,
 acting as a powerful umbrella - shielding web applications from
 attacks.
 
-%description -l pl
+%description -l pl.UTF-8
 ModSecurity jest otwartym silnikiem wykrywania i zapobiegania intruzom
-dla aplikacji webowych. Operuje w ramach serwera www, dzia³aj±c jak
-potê¿ny parasol chroni±cy aplikacje webowe przed atakami.
+dla aplikacji WWW. Operuje w ramach serwera WWW, działając jak potężny
+parasol chroniący aplikacje WWW przed atakami.
 
 %prep
-%setup -q -n mod_%{mod_name}-%{version}
+%setup -q -n modsecurity-apache_%{version}
 
 %build
 cd apache2
@@ -39,28 +38,26 @@ cd apache2
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_pkglibdir}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
 
 install apache2/.libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > \
+	$RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/90_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
+%postun
 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 CHANGES modsecurity-manual.pdf httpd.conf*
-%attr(755,root,root) %{_pkglibdir}/*
+%doc CHANGES README httpd.conf*
+%doc doc/modsecurity-manual.[ch]* doc/*.gif util
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*.so