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

Changed files:
    apache1-mod_msff.spec -> 1.10

diff --git a/apache1-mod_msff.spec b/apache1-mod_msff.spec
index bb44afad5fdd8c3c358a8ba66df4456cabfef2fe..0e1f2551c8ee21f99044a3cf4a3ee79a62f4c4c0 100644 (file)
--- a/apache1-mod_msff.spec
+++ b/apache1-mod_msff.spec
@@ -4,21 +4,20 @@ Summary:      Apache module: Microsoft Free Fridays: reject MSIE on Friday
 Summary(pl):   Modu³ do apache: Wolne Pi±tki Microsoftu: odrzuca MSIE w pi±tki
 Name:          apache1-mod_%{mod_name}
 Version:       0.1
-Release:       1
+Release:       1.1
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://unlikely.org/mike/hacks/mod_%{mod_name}.c
 # Source0-md5: 28bf69adb4beb41d82f16c2cc2e9d656
 URL:           http://davenet.userland.com/2001/06/13
 BuildRequires: %{apxs}
-BuildRequires: apache1-devel
-Requires(post,preun):  %{apxs}
-Requires:      apache1
+BuildRequires: apache1-devel >= 1.3.33-2
+Requires:      apache1 >= 1.3.33-2
 Obsoletes:     apache-mod_%{mod_name} <= %{version}
 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
 mod_msff.c: Microsoft Free Fridays: reject MSIE on Friday.
@@ -42,22 +41,23 @@ cp %{SOURCE0} .
 
 %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
@@ -65,4 +65,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}/*