rpms/mod_fcgid
5
0
Fork 0
Code Issues Pull Requests Releases Activity

use 10- prefix for conf file in conf.modules.d w/2.4

Browse Source 
- use _httpd_confdir throughout, if available
This commit is contained in:
Joe Orton 2012-05-02 08:29:49 +01:00
parent fa7284a27f
commit c8f59ce6c9
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mod_fcgid.spec
View File

@ -20,6 +20,9 @@
# Module Magic Number # Module Magic Number
%{!?_httpd_mmn: %global _httpd_mmn %(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo missing-httpd-devel)} %{!?_httpd_mmn: %global _httpd_mmn %(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo missing-httpd-devel)}
# Configuration directory
%{!?_httpd_confdir: %{expand: %%global _httpd_confdir %%{_sysconfdir}/httpd/conf.d}}
# For httpd ≥ 2.4 we have a different filesystem layout # For httpd ≥ 2.4 we have a different filesystem layout
%if 0%{?fedora} > 17 || 0%{?rhel} > 6 %if 0%{?fedora} > 17 || 0%{?rhel} > 6
%global httpd24 1 %global httpd24 1
@ -31,7 +34,7 @@
Name: mod_fcgid Name: mod_fcgid
Version: 2.3.7 Version: 2.3.7
Release: 1%{?dist} Release: 2%{?dist}
Summary: FastCGI interface module for Apache 2 Summary: FastCGI interface module for Apache 2
Group: System Environment/Daemons Group: System Environment/Daemons
License: ASL 2.0 License: ASL 2.0
@ -133,10 +136,10 @@ rm -rf %{buildroot}
make DESTDIR=%{buildroot} MKINSTALLDIRS="mkdir -p" install make DESTDIR=%{buildroot} MKINSTALLDIRS="mkdir -p" install
%if %{httpd24} %if %{httpd24}
mkdir -p %{buildroot}{%{_httpd_confdir},%{_httpd_modconfdir}} mkdir -p %{buildroot}{%{_httpd_confdir},%{_httpd_modconfdir}}
echo "LoadModule fcgid_module modules/mod_fcgid.so" > %{buildroot}%{_httpd_modconfdir}/fcgid.conf echo "LoadModule fcgid_module modules/mod_fcgid.so" > %{buildroot}%{_httpd_modconfdir}/10-fcgid.conf
install -D -m 644 fcgid24.conf %{buildroot}%{_httpd_confdir}/fcgid.conf install -D -m 644 fcgid24.conf %{buildroot}%{_httpd_confdir}/fcgid.conf
%else %else
install -D -m 644 fcgid.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/fcgid.conf install -D -m 644 fcgid.conf %{buildroot}%{_httpd_confdir}/fcgid.conf
%endif %endif
install -d -m 755 %{buildroot}%{rundir}/mod_fcgid install -d -m 755 %{buildroot}%{rundir}/mod_fcgid
@ -202,11 +205,9 @@ exit 0
%doc build/fixconf.sed %doc build/fixconf.sed
%{_libdir}/httpd/modules/mod_fcgid.so %{_libdir}/httpd/modules/mod_fcgid.so
%if %{httpd24} %if %{httpd24}
%config(noreplace) %{_httpd_modconfdir}/fcgid.conf %config(noreplace) %{_httpd_modconfdir}/*.conf
%config(noreplace) %{_httpd_confdir}/fcgid.conf
%else
%config(noreplace) %{_sysconfdir}/httpd/conf.d/fcgid.conf
%endif %endif
%config(noreplace) %{_httpd_confdir}/fcgid.conf
%if 0%{?fedora} > 14 || 0%{?rhel} > 6 %if 0%{?fedora} > 14 || 0%{?rhel} > 6
%{_sysconfdir}/tmpfiles.d/mod_fcgid.conf %{_sysconfdir}/tmpfiles.d/mod_fcgid.conf
%endif %endif
@ -220,6 +221,10 @@ exit 0
%endif %endif
%changelog %changelog
* Wed May 2 2012 Joe Orton <jorton@redhat.com> - 2.3.7-2
- use 10- prefix for conf file in conf.modules.d w/2.4
- use _httpd_confdir throughout, if available
* Mon Apr 23 2012 Paul Howarth <paul@city-fan.org> 2.3.7-1 * Mon Apr 23 2012 Paul Howarth <paul@city-fan.org> 2.3.7-1
- Update to 2.3.7 - Update to 2.3.7
- Introduce FcgidWin32PreventOrphans directive on Windows to use OS Job - Introduce FcgidWin32PreventOrphans directive on Windows to use OS Job