Merge branch 'master' into f27
This commit is contained in:
commit
55af8c884a
@ -13,7 +13,7 @@
|
||||
Summary: Apache HTTP Server
|
||||
Name: httpd
|
||||
Version: 2.4.33
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
URL: https://httpd.apache.org/
|
||||
Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
|
||||
Source1: index.html
|
||||
@ -584,6 +584,7 @@ exit $rv
|
||||
%exclude %{_sysconfdir}/httpd/conf.modules.d/00-proxyhtml.conf
|
||||
%exclude %{_sysconfdir}/httpd/conf.modules.d/01-ldap.conf
|
||||
%exclude %{_sysconfdir}/httpd/conf.modules.d/01-session.conf
|
||||
%exclude %{_sysconfdir}/httpd/conf.modules.d/01-md.conf
|
||||
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/htcacheclean
|
||||
%ghost %{_sysconfdir}/sysconfig/httpd
|
||||
@ -703,6 +704,9 @@ exit $rv
|
||||
%{_rpmconfigdir}/macros.d/macros.httpd
|
||||
|
||||
%changelog
|
||||
* Fri Mar 30 2018 Adam Williamson <awilliam@redhat.com> - 2.4.33-2
|
||||
- Exclude mod_md config file from main package (#1562413)
|
||||
|
||||
* Wed Mar 28 2018 Joe Orton <jorton@redhat.com> - 2.4.33-1
|
||||
- rebase to 2.4.33 (#1560174)
|
||||
- add mod_md subpackage; load mod_proxy_uwsgi by default
|
||||
|
Loading…
Reference in New Issue
Block a user