- confdir enabled apache1 (no triggers as it wasn't on ftp)

Changed files:
    apache1-mod_ntlm.spec -> 1.18

diff --git a/apache1-mod_ntlm.spec b/apache1-mod_ntlm.spec
index 830a5438a979dfa1fb2e93e6fac772738bace772..3fa55a4147a8d489ac58890385986362252ed8a9 100644 (file)
--- a/apache1-mod_ntlm.spec
+++ b/apache1-mod_ntlm.spec
@@ -5,7 +5,7 @@ Summary:        This is the NTLM authentication module for Apache
 Summary(pl):   Modu³ uwierzytelnienia NTLM dla Apache
 Name:          apache1-mod_%{mod_name}
 Version:       0.4
-Release:       0.1
+Release:       0.2
 Epoch:         1
 License:       GPL
 Group:         Networking/Daemons
@@ -14,13 +14,14 @@ Source0:    http://dl.sourceforge.net/modntlm/mod_%{mod_name}-%{version}.tar.gz
 Patch0:                %{name}-security.patch
 URL:           http://modntlm.sourceforge.net/
 BuildRequires: %{apxs}
-BuildRequires: apache1-devel
+BuildRequires: apache1-devel >= 1.3.33-2
 Requires(post,preun):  %{apxs}
-Requires:      apache1
+Requires:      apache1 >= 1.3.33-2
 Obsoletes:     apache-mod_%{mod_name} <= %{epoch}:%{version}
 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
 This is an authentication module for Apache that allows you to
@@ -41,22 +42,23 @@ u
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_pkglibdir}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d}
 
 install 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/apache ]; then
        /etc/rc.d/init.d/apache 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/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
        fi
@@ -64,4 +66,5 @@ fi
 
 %files
 %defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*