- confdir enabled apache1

Changed files:
    apache1-mod_video.spec -> 1.21

diff --git a/apache1-mod_video.spec b/apache1-mod_video.spec
index 319aba95d521a501c9de081fcb4fec0c0d9f6331..d1e62c81eb7a04c41487a4b1b7a6304782d2f974 100644 (file)
--- a/apache1-mod_video.spec
+++ b/apache1-mod_video.spec
@@ -4,7 +4,7 @@ Summary:        Shows images grabbed from a v4l device
 Summary(pl):   Wy¶wietla obrazy zrzucone z urz±dzenia v4l
 Name:          apache1-mod_%{mod_name}
 Version:       0.1.0
-Release:       1
+Release:       1.1
 License:       GPL v2
 Group:         Networking/Daemons
 Source0:       http://borud.no/mod_video/download/mod_%{mod_name}-%{version}.tar.gz
@@ -12,16 +12,17 @@ Source0:    http://borud.no/mod_video/download/mod_%{mod_name}-%{version}.tar.gz
 Patch0:                %{name}-webcam.patch
 URL:           http://modvideo.sourceforge.net/
 BuildRequires: %{apxs}
+BuildRequires: apache1-devel >= 1.3.33-2
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: zlib-devel
-BuildRequires: apache1-devel
-Requires(post,preun):  %{apxs}
-Requires:      apache1
+Requires(triggerpostun):       %{apxs}
+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                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 This package contains an Apache module for serving snapshots from the
@@ -42,26 +43,36 @@ API.
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -D mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d}
+
+install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so
+
+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} < 0.1.0-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 doc/*
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*