- confdir enabled apache1

Changed files:
    apache1-mod_auth_any.spec -> 1.27

diff --git a/apache1-mod_auth_any.spec b/apache1-mod_auth_any.spec
index be0fa8f55276c711405091a34e92a348a5b202fa..9dd99443b9f61f228c15371f02a6706d566ff521 100644 (file)
--- a/apache1-mod_auth_any.spec
+++ b/apache1-mod_auth_any.spec
@@ -13,7 +13,7 @@ Summary(sl):  Osnovna avtentikacija za spletni stre
 Summary(sv):   Grundläggande autentisering för webbservern Apache med valfria skalkommandon
 Name:          apache1-mod_%{mod_name}
 Version:       1.4
-Release:       1
+Release:       1.5
 Epoch:         1
 License:       BSD
 Group:         Networking/Daemons
@@ -21,14 +21,15 @@ Source0:    http://www.itlab.musc.edu/webNIS/dist/mod_%{mod_name}-%{version}.tar.gz
 # Source0-md5: 73e2aef19a126b77190e59b20486c8d9
 URL:           http://www.itlab.musc.edu/webNIS/mod_auth_any.html
 BuildRequires: %{apxs}
-BuildRequires: apache1-devel
-Requires(post,preun):  %{apxs}
-Requires:      apache1
+BuildRequires: apache1-devel >= 1.3.33-2
+Requires(triggerpostun):       %{apxs}
+Requires:      apache1 >= 1.3.33-2
 # weird versioning scheme...
 Obsoletes:     apache-mod_%{mod_name} <= 1:%{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 module allows you to use any command line program (such as
@@ -81,28 +82,35 @@ godtyckligt angivet kommando.
 
 %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
 fi
 
+%triggerpostun -- apache1-mod_%{mod_name} < 1:1.4-1.1
+# check that they're not using old apache.conf
+if grep -q '^Include conf\.d' /etc/apache/apache.conf; then
+       %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc docs/*
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*