SPECS: apache-mod_chroot.spec - unified

[glen]

Author: glen                         Date: Mon Dec 26 19:19:10 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified

---- Files affected:
SPECS:
   apache-mod_chroot.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_chroot.spec
diff -u SPECS/apache-mod_chroot.spec:1.2 SPECS/apache-mod_chroot.spec:1.3
--- SPECS/apache-mod_chroot.spec:1.2	Tue Jul  5 12:10:47 2005
+++ SPECS/apache-mod_chroot.spec	Mon Dec 26 20:19:05 2005
@@ -12,12 +12,12 @@
 # Source0-md5:	d72716052faa3bdd3371210f26b13f38
 URL:		http://core.segfault.pl/~hobbit/mod_chroot/
 BuildRequires:	%{apxs}
-BuildRequires:	apache-devel
-Requires(post,preun):	%{apxs}
-Requires:	apache
+BuildRequires:	apache-devel >= 2.0
+Requires:	apache(modules-api) = %apache_modules_api
 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,15 +37,31 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
 
-install -D .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so
+install .libs/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}/httpd.conf/90_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+if [ -f /var/lock/subsys/httpd ]; then
+	/etc/rc.d/init.d/httpd restart 1>&2
+fi
+
+%preun
+if [ "$1" = "0" ]; then
+	if [ -f /var/lock/subsys/httpd ]; then
+		/etc/rc.d/init.d/httpd restart 1>&2
+	fi
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc CAVEATS ChangeLog INSTALL README
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -54,9 +70,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2005/12/26 19:19:05  glen
+- unified
+
 Revision 1.2  2005/07/05 10:10:47  areq
 - 0.5
 
 Revision 1.1  2005/01/23 00:28:43  matowy
 - new, copy from apache1-mod_chroot.spec
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod_chroot.spec?r1=1.2&r2=1.3&f=u