X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache1-mod_security.spec;h=6ec9b80b7b1663b7ebddff76211ac57f3bd83c04;hb=53c484ddb79c513f81dc55dbec6b6b97eb1f6b5f;hp=b9912d8067a87d3c681f9c8f27f96a579204b6c3;hpb=d1f06e7cfa319ba521df45790382a912af470ea8;p=packages%2Fapache1-mod_security.git

diff --git a/apache1-mod_security.spec b/apache1-mod_security.spec
index b9912d8..6ec9b80 100644
--- a/apache1-mod_security.spec
+++ b/apache1-mod_security.spec
@@ -1,22 +1,22 @@
 %define		mod_name	security
 %define 	apxs		/usr/sbin/apxs1
 Summary:	Apache module: securing web applications
-Summary(pl):	Modu³ do apache: ochrona aplikacji WWW
+Summary(pl.UTF-8):   Moduł do apache: ochrona aplikacji WWW
 Name:		apache1-mod_%{mod_name}
-Version:	1.8.6
+Version:	1.8.7
 Release:	0.1
 License:	GPL v2
 Group:		Networking/Daemons
-Source0:	http://www.modsecurity.org/download/mod_security-%{version}.tar.gz
-# Source0-md5:	f6bf4724dd0db3d37586b64bc0ee160d
-URL:		http://sourceforge.net/projects/mod-acct/
-BuildRequires:	apache1-devel
-Requires(post,preun):	%{apxs}
-Requires:	apache1
+Source0:	http://www.modsecurity.org/download/modsecurity-%{version}.tar.gz
+# Source0-md5:	0dd48656e451c711358c097dc80e0369
+URL:		http://www.modsecurity.org/
+BuildRequires:	apache1-devel >= 1.3.33-2
+BuildRequires:	rpmbuild(macros) >= 1.268
+Requires:	apache1 >= 1.3.33-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR)
-%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR)
+%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
@@ -24,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 WWW. Operuje w ramach serwera WWW, dzia³aj±c jak
-potê¿ny parasol chroni±cy aplikacje WWW 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 mod%{mod_name}-%{version}
 
 %build
 cd apache1
@@ -38,28 +38,26 @@ cd apache1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_pkglibdir}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d}
 
 install apache1/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 
+echo 'LoadModule %{mod_name}_module	modules/mod_%{mod_name}.so' > \
+	$RPM_BUILD_ROOT%{_sysconfdir}/conf.d/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 apache 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 apache restart
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc README CHANGES modsecurity-manual.pdf httpd.conf*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*