diff options
| -rw-r--r-- | httpd.conf | 4 | ||||
| -rw-r--r-- | httpd.spec | 8 |
2 files changed, 9 insertions, 3 deletions
@@ -347,5 +347,5 @@ EnableSendfile on # Supplemental configuration # -# Load conf files in the "/etc/httpd/conf.d" directory. -Include conf.d/*.conf +# Load config files in the "/etc/httpd/conf.d" directory, if any. +IncludeOptional conf.d/*.conf @@ -8,7 +8,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.4.3 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source1: index.html @@ -578,6 +578,12 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/rpm/macros.httpd %changelog +* Fri Sep 14 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.4.3-4 +- sync with rawhide, rebuild for remi repo + +* Thu Sep 13 2012 Joe Orton <jorton@redhat.com> - 2.4.3-4 +- use IncludeOptional for conf.d/*.conf inclusion + * Wed Sep 12 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.4.3-3 - sync with rawhide, rebuild for remi repo |