From: Elan Ruusamäe <glen@pld-linux.org>
Date: Mon, 26 Dec 2005 19:37:01 +0000 (+0000)
Subject: - unified
X-Git-Tag: auto/ac/apache-mod_fastcgi-2_4_2-8~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapache-mod_fastcgi.git;a=commitdiff_plain;h=74af29f373b2ec3da43e985fbdb2e701f734df8f;hp=93e7644f86af15cc95f094b18344ead7a8698bb5

- unified

Changed files:
    apache-mod_fastcgi.spec -> 1.44
---

diff --git a/apache-mod_fastcgi.spec b/apache-mod_fastcgi.spec
index c60c2b0..d22d5db 100644
--- a/apache-mod_fastcgi.spec
+++ b/apache-mod_fastcgi.spec
@@ -20,12 +20,11 @@ URL:		http://www.FastCGI.com/
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.2
 BuildRequires:	libtool
-Requires(post,preun):	%{apxs}
 Requires:	apache(modules-api) = %apache_modules_api
 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)
 %define		_socketdir	/var/run/httpd/fastcgi
 
 %description
@@ -69,7 +68,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf,%{_socketdir}/dynamic}
 
 install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd.conf/
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/90_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -77,8 +76,6 @@ rm -rf $RPM_BUILD_ROOT
 %post
 if [ -f /var/lock/subsys/httpd ]; then
 	/etc/rc.d/init.d/httpd restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
 fi
 
 %preun
@@ -91,7 +88,7 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc docs/LICENSE.TERMS CHANGES docs/*.html
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*.so
-%config %{_sysconfdir}/httpd.conf/*.conf
 %dir %attr(770,root,http) %{_socketdir}
 %dir %attr(770,root,http) %{_socketdir}/dynamic