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_auth_pam-1_1_1-4~2
X-Git-Url: https://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=66267b385df26ded46d6ecefd5e5dd306937c565;p=packages%2Fapache1-mod_auth_pam.git

- confdir enabled apache1

Changed files:
    apache1-mod_auth_pam.spec -> 1.27
---

diff --git a/apache1-mod_auth_pam.spec b/apache1-mod_auth_pam.spec
index 8f26df3..582e9f7 100644
--- a/apache1-mod_auth_pam.spec
+++ b/apache1-mod_auth_pam.spec
@@ -6,7 +6,7 @@ Summary(pl):	Modu
 Summary(pt_BR):	Este módulo provê autenticação PAM para o Apache
 Name:		apache1-mod_%{mod_name}
 Version:	1.1.1
-Release:	3
+Release:	3.3
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://pam.sourceforge.net/mod_auth_pam/dist/mod_%{mod_name}-%{version}.tar.gz
@@ -15,13 +15,14 @@ Patch0:		%{name}-symbol_fix.patch
 Patch1:		%{name}-broken_lines.patch
 URL:		http://pam.sourceforge.net/mod_auth_pam/
 BuildRequires:	%{apxs}
-BuildRequires:	apache1-devel
-Requires(post,preun):	%{apxs}
-Requires:	apache1
+BuildRequires:	apache1-devel >= 1.3.33-2
+Requires(triggerpostun):	%{apxs}
+Requires:	apache1 >= 1.3.33-2
 Obsoletes:	apache-mod_%{mod_name} <= %{version}-%{release}
 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 is an authentication module for Apache that allows you to
@@ -48,30 +49,38 @@ diret
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},/etc/pam.d}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d,/etc/pam.d}
 
 install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 install samples/httpd- $RPM_BUILD_ROOT/etc/pam.d/httpd
 
+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-3.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/{configure,faq}.txt samples/dot-htaccess README
 %config(noreplace) /etc/pam.d/httpd
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*