From 7847f60cb2ce099f71792af9a831bbe09e53c067 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Sun, 17 May 2009 08:40:06 +0000 Subject: [PATCH] Follow link /etc/httpd/run and make our "run" directory a subdir of wherever that leads (#501123) --- mod_fcgid.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/mod_fcgid.spec b/mod_fcgid.spec index 8e38304..a2ff842 100644 --- a/mod_fcgid.spec +++ b/mod_fcgid.spec @@ -14,9 +14,12 @@ %global selinux_buildreqs checkpolicy, selinux-policy-devel, hardlink %endif +# /etc/httpd/run is a symlink to /var/run prior to Fedora 11, to /var/run/httpd thereafter +%global rundir %(/usr/bin/readlink /etc/httpd/run | %{__sed} -e 's|^\.\./\.\.||') + Name: mod_fcgid Version: 2.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Apache2 module for high-performance server-side scripting Group: System Environment/Daemons License: GPL+ @@ -117,7 +120,7 @@ topdir=$(/usr/bin/dirname $(/usr/sbin/apxs -q exp_installbuilddir)) MKINSTALLDIRS="%{__mkdir_p}" \ install %{__install} -D -m 644 fcgid.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/fcgid.conf -%{__install} -d -m 755 %{buildroot}%{_localstatedir}/run/mod_fcgid +%{__install} -d -m 755 %{buildroot}%{rundir}/mod_fcgid # Install SELinux policy modules %if %{selinux_module} @@ -165,7 +168,7 @@ exit 0 %doc README.RPM %{_libdir}/httpd/modules/mod_fcgid.so %config(noreplace) %{_sysconfdir}/httpd/conf.d/fcgid.conf -%dir %attr(0755,apache,apache) %{_localstatedir}/run/mod_fcgid/ +%dir %attr(0755,apache,apache) %{rundir}/mod_fcgid/ %if %{selinux_module} %files selinux @@ -175,6 +178,10 @@ exit 0 %endif %changelog +* Sun May 17 2009 Paul Howarth 2.2-11 +- Follow link /etc/httpd/run and make our "run" directory a subdir of wherever + that leads (#501123) + * Mon Apr 6 2009 Paul Howarth 2.2-10 - EL 5.3 now has SELinux support in the main selinux-policy package so handle that release as per Fedora >= 8, except that the RHEL selinux-policy package