SPECS: apache-mod_suid2.spec - unified

[glen]

Author: glen                         Date: Tue Dec 27 00:51:05 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified

---- Files affected:
SPECS:
   apache-mod_suid2.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_suid2.spec
diff -u SPECS/apache-mod_suid2.spec:1.6 SPECS/apache-mod_suid2.spec:1.7
--- SPECS/apache-mod_suid2.spec:1.6	Sun Sep 19 20:58:24 2004
+++ SPECS/apache-mod_suid2.spec	Tue Dec 27 01:51:00 2005
@@ -15,11 +15,11 @@
 URL:		http://bluecoara.net/servers/apache/mod_suid2_en.phtml
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.0.0
-Requires(post,preun):	%{apxs}
-Requires:	apache
+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
 Apache module: execution of scripts under their own uids per-vhost.
@@ -37,16 +37,31 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_pkglibdir}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
 
 install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+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 CHANGES
+%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"`)
@@ -55,6 +70,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2005/12/27 00:51:00  glen
+- unified
+
 Revision 1.6  2004/09/19 18:58:24  radek
 - unified
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod_suid2.spec?r1=1.6&r2=1.7&f=u