From: Elan Ruusamäe <glen@pld-linux.org>
Date: Thu, 10 Feb 2005 01:48:18 +0000 (+0000)
Subject: - confdir enabled apache1
X-Git-Tag: auto/ac/apache1-mod_suid-1_1-2~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapache1-mod_suid.git;a=commitdiff_plain;h=7de4664030e7be793d40e2afe30b44fb3dd3887b

- confdir enabled apache1

Changed files:
    apache1-mod_suid.spec -> 1.7
---

diff --git a/apache1-mod_suid.spec b/apache1-mod_suid.spec
index 724d796..22be8c2 100644
--- a/apache1-mod_suid.spec
+++ b/apache1-mod_suid.spec
@@ -4,17 +4,17 @@ Summary:	Apache module: execution of scripts under their own uids
 Summary(pl):	Modu³ do apache: wykonywanie skryptów pod wskazanym uidem
 Name:		apache1-mod_%{mod_name}
 Version:	1.1
-Release:	1
+Release:	1.1
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://www.jdimedia.nl/igmar/mod_%{mod_name}/files/mod_%{mod_name}-%{version}.tar.gz
 # Source0-md5:	1e47d40d8f0404d9faa3040655df44a2
 URL:		http://www.jdimedia.nl/igmar/mod_suid/
 BuildRequires:	%{apxs}
-BuildRequires:	apache1-devel
+BuildRequires:	apache1-devel >= 1.3.33-2
 BuildRequires:	zlib-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)
 
@@ -34,28 +34,36 @@ Modu
 
 %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
 fi
 
+%triggerpostun -- apache1-mod_%{mod_name} < 1.1-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 CHANGES.txt README
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*