SPECS: apache-mod_security.spec - unified

[glen]

Author: glen                         Date: Tue Dec 27 00:49:40 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified

---- Files affected:
SPECS:
   apache-mod_security.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_security.spec
diff -u SPECS/apache-mod_security.spec:1.11 SPECS/apache-mod_security.spec:1.12
--- SPECS/apache-mod_security.spec:1.11	Fri Dec  2 20:33:02 2005
+++ SPECS/apache-mod_security.spec	Tue Dec 27 01:49:35 2005
@@ -4,21 +4,19 @@
 Summary:	Apache module: securing web applications
 Summary(pl):	Moduł do apache: ochrona aplikacji WWW
 Name:		apache-mod_%{mod_name}
-%define	_pre	%{nil}
 Version:	1.9.1
 Release:	1
 License:	GPL v2
 Group:		Networking/Daemons
-Source0:	http://www.modsecurity.org/download/modsecurity-apache-%{version}%{_pre}.tar.gz
+Source0:	http://www.modsecurity.org/download/modsecurity-apache-%{version}.tar.gz
 # Source0-md5:	d648ba26b1dba708a06344072bea984c
 URL:		http://www.modsecurity.org/
 BuildRequires:	apache-devel
-Requires(post,preun):	%{apxs}
-Requires:	apache
+Requires:	apache(modules-api) = %apache_modules_api
 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
@@ -28,11 +26,11 @@
 
 %description -l pl
 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 modsecurity-apache-%{version}%{_pre}
+%setup -q -n modsecurity-apache-%{version}
 
 %build
 cd apache2
@@ -40,22 +38,22 @@
 
 %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
 
 %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
@@ -64,7 +62,8 @@
 %files
 %defattr(644,root,root,755)
 %doc README CHANGES httpd.conf*
-%attr(755,root,root) %{_pkglibdir}/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -72,6 +71,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2005/12/27 00:49:35  glen
+- unified
+
 Revision 1.11  2005/12/02 19:33:02  zbyniu
 - up to 1.9.1 (stable), rel 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod_security.spec?r1=1.11&r2=1.12&f=u