- unified

Changed files:
    apache-mod_security.spec -> 1.12

diff --git a/apache-mod_security.spec b/apache-mod_security.spec
index 424182162eb7e1bff5042150dd040e44f0a9199d..396a0592038c8dbd72bcdcb0d7f22def8b940314 100644 (file)
--- a/apache-mod_security.spec
+++ b/apache-mod_security.spec
@@ -3,21 +3,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
@@ -27,11 +25,11 @@ attacks.
 
 %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
@@ -39,22 +37,22 @@ 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
 
 %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
@@ -63,4 +61,5 @@ fi
 %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