From: bszx <bszx@pld-linux.org>
Date: Sun, 12 Sep 2004 07:08:59 +0000 (+0000)
Subject: - config manipulation in post/preun scripts replaced by config file
X-Git-Tag: auto/ac/apache-mod_auth_pam-2_0-3~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapache-mod_auth_pam.git;a=commitdiff_plain;h=1e3168c6af2693addf62459abaf1582f53b4dd96

- config manipulation in post/preun scripts replaced by config file

Changed files:
    apache-mod_auth_pam.conf -> 1.1
    apache-mod_auth_pam.spec -> 1.30
---

diff --git a/apache-mod_auth_pam.conf b/apache-mod_auth_pam.conf
new file mode 100644
index 0000000..42bb88c
--- /dev/null
+++ b/apache-mod_auth_pam.conf
@@ -0,0 +1,2 @@
+LoadModule pam_auth_module		modules/mod_auth_pam2.so
+LoadModule etc_group_auth_module	modules/mod_auth_etc_group.so
diff --git a/apache-mod_auth_pam.spec b/apache-mod_auth_pam.spec
index 14e5009..0bdfede 100644
--- a/apache-mod_auth_pam.spec
+++ b/apache-mod_auth_pam.spec
@@ -6,19 +6,20 @@ Summary(pl):	Modu
 Summary(pt_BR):	Este módulo provê autenticação PAM para o Apache
 Name:		apache-mod_%{mod_name}
 Version:	2.0
-Release:	2
+Release:	3
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://pam.sourceforge.net/mod_%{mod_name}/dist/mod_%{mod_name}-%{version}.tar.gz
 # Source0-md5:	561a495f27e6cc810641bd6ce6db3d02
+Source1:	apache-mod_auth_pam.conf
 Patch0:		%{name}-missing_constant.patch
 URL:		http://pam.sourceforge.net/mod_auth_pam/
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2
-Requires(post,preun):	%{apxs}
 Requires:	apache >= 2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_sysconfdir	/etc/httpd
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR)
 
 %description
@@ -46,25 +47,22 @@ diret
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},/etc/pam.d}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},/etc/pam.d,%{_sysconfdir}/httpd.conf/}
 
 install .libs/mod_*.so $RPM_BUILD_ROOT%{_pkglibdir}
 install ../samples/httpd- $RPM_BUILD_ROOT/etc/pam.d/httpd
+install %SOURCE1 $RPM_BUILD_ROOT/%{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{apxs} -e -a -n %{mod_name}2   %{_pkglibdir}/mod_%{mod_name}2.so   1>&2
-%{apxs} -e -a -n auth_etc_group %{_pkglibdir}/mod_auth_etc_group.so 1>&2
 if [ -f /var/lock/subsys/httpd ]; then
 	/etc/rc.d/init.d/httpd restart 1>&2
 fi
 
 %preun
 if [ "$1" = "0" ]; then
-	%{apxs} -e -A -n %{mod_name}2   %{_pkglibdir}/mod_%{mod_name}2.so   1>&2
-	%{apxs} -e -A -n auth_etc_group %{_pkglibdir}/mod_auth_etc_group.so 1>&2
 	if [ -f /var/lock/subsys/httpd ]; then
 		/etc/rc.d/init.d/httpd restart 1>&2
 	fi
@@ -74,4 +72,5 @@ fi
 %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}/httpd.conf/*_mod_auth_pam.conf
 %attr(755,root,root) %{_pkglibdir}/*.so