From: Elan Ruusamäe <glen@pld-linux.org>
Date: Thu, 10 Feb 2005 18:03:52 +0000 (+0000)
Subject: - confdir enabled apache1 (no triggers as it wasn't on ftp)
X-Git-Tag: auto/ac/apache1-mod_fastcgi-2_4_2-2~5
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fapache1-mod_fastcgi.git;a=commitdiff_plain;h=c10dfacb4283ba60e2c7b61b8671329885da1154

- confdir enabled apache1 (no triggers as it wasn't on ftp)
- fix uid-gid patch (take rev 1.1)

Changed files:
    apache1-mod_fastcgi.spec -> 1.39
---

diff --git a/apache1-mod_fastcgi.spec b/apache1-mod_fastcgi.spec
index 1f50c54..f358d3c 100644
--- a/apache1-mod_fastcgi.spec
+++ b/apache1-mod_fastcgi.spec
@@ -7,22 +7,21 @@ Summary(uk):	FastCGI - ¦
 Name:		apache1-mod_%{mod_name}
 # NOTE: remember about apache-mod_fastcgi.spec when messing here
 Version:	2.4.2
-Release:	1
+Release:	1.1
 License:	distributable
 Group:		Networking/Daemons
 Source0:	http://www.FastCGI.com/dist/mod_%{mod_name}-%{version}.tar.gz
 # Source0-md5:	e994414304b535cb99e10b7d1cad1d1e
-Patch0:		apache-mod_%{mod_name}-allow-uid-gid.patch
+Patch0:		%{name}-allow-uid-gid.patch
 URL:		http://www.FastCGI.com/
 BuildRequires:	%{apxs}
-BuildRequires:	apache1-devel >= 1.3.1
+BuildRequires:	apache1-devel >= 1.3.33-2
 BuildRequires:	libtool
-Requires(post,preun):	%{apxs}
-Requires:	apache1 >= 1.3.1
+Requires:	apache1 >= 1.3.33-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR)
-%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR)
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 This 3rd party module provides support for the FastCGI protocol.
@@ -58,30 +57,32 @@ FastCGI - 
 
 %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
 else
 	echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon."
 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
- 
+
 %files
 %defattr(644,root,root,755)
-%doc docs/LICENSE.TERMS CHANGES docs/*.html 
+%doc docs/LICENSE.TERMS CHANGES docs/*.html
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*.so