From 01afa4e31d45a57c092aa950081aa1187621fbc8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Thu, 10 Feb 2005 18:03:43 +0000
Subject: [PATCH] - confdir enabled apache1 (no triggers as it wasn't on ftp) -
 add missing apache restart

Changed files:
    apache1-mod_chroot.spec -> 1.5
---
 apache1-mod_chroot.spec | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/apache1-mod_chroot.spec b/apache1-mod_chroot.spec
index 429bc26..a8912c8 100644
--- a/apache1-mod_chroot.spec
+++ b/apache1-mod_chroot.spec
@@ -4,19 +4,19 @@ Summary:	Apache module: makes running Apache in a secure chroot environment easy
 Summary(pl):	Modu³ Apache'a do uruchamiania serwera w bezpiecznym ¶rodowisku chroot
 Name:		apache1-mod_%{mod_name}
 Version:	0.4
-Release:	0.1
+Release:	0.2
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://core.segfault.pl/~hobbit/mod_chroot/dist/mod_chroot-%{version}.tar.gz
 # Source0-md5:	abd2c8209b61b2a2fecdf10a61051060
 URL:		http://core.segfault.pl/~hobbit/mod_chroot/
 BuildRequires:	%{apxs}
-BuildRequires:	apache1-devel >= 1.3.31
-Requires(post,preun):	%{apxs}
-Requires:	apache1 >= 1.3.31
+BuildRequires:	apache1-devel >= 1.3.33-2
+Requires:	apache1 >= 1.3.33-2
 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
 mod_chroot makes running Apache in a secure chroot environment easy.
@@ -37,12 +37,29 @@ chroot. Nie trzeba tworzy
 %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
+if [ -f /var/lock/subsys/apache ]; then
+	/etc/rc.d/init.d/apache restart 1>&2
+fi
+
+%preun
+if [ "$1" = "0" ]; then
+	if [ -f /var/lock/subsys/apache ]; then
+		/etc/rc.d/init.d/apache restart 1>&2
+	fi
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc CAVEATS ChangeLog INSTALL README
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*.so
-- 
2.44.0