diff --git a/mod_fcgid.spec b/mod_fcgid.spec index 1ed8a87..aad54d3 100644 --- a/mod_fcgid.spec +++ b/mod_fcgid.spec @@ -21,7 +21,7 @@ %{!?_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}} +%{!?_httpd_confdir: %global _httpd_confdir %{_sysconfdir}/httpd/conf.d} # For httpd ≥ 2.4 we have a different filesystem layout %if 0%{?fedora} > 17 || 0%{?rhel} > 6 @@ -34,7 +34,7 @@ Name: mod_fcgid Version: 2.3.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: FastCGI interface module for Apache 2 Group: System Environment/Daemons License: ASL 2.0 @@ -205,7 +205,7 @@ exit 0 %doc build/fixconf.sed %{_libdir}/httpd/modules/mod_fcgid.so %if %{httpd24} -%config(noreplace) %{_httpd_modconfdir}/*.conf +%config(noreplace) %{_httpd_modconfdir}/10-fcgid.conf %endif %config(noreplace) %{_httpd_confdir}/fcgid.conf %if 0%{?fedora} > 14 || 0%{?rhel} > 6 @@ -221,9 +221,12 @@ exit 0 %endif %changelog -* Wed May 2 2012 Joe Orton - 2.3.7-2 -- use 10- prefix for conf file in conf.modules.d w/2.4 -- use _httpd_confdir throughout, if available +* Wed May 2 2012 Paul Howarth 2.3.7-3 +- Make %%files list more explicit + +* Wed May 2 2012 Joe Orton 2.3.7-2 +- Use 10- prefix for conf file in conf.modules.d with httpd ≥ 2.4 +- Use _httpd_confdir throughout * Mon Apr 23 2012 Paul Howarth 2.3.7-1 - Update to 2.3.7