Reapplied changes

This commit is contained in:
Daniel Steiner
2018-03-14 20:10:44 +01:00
parent 70cb778ae6
commit 003025ac99

View File

@@ -8,7 +8,7 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.4.29 Version: 2.4.29
Release: 1%{?dist} Release: 2%{?dist}
URL: http://httpd.apache.org/ URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html Source1: index.html
@@ -44,6 +44,7 @@ Source30: README.confd
Source31: README.confmod Source31: README.confmod
Source40: htcacheclean.service Source40: htcacheclean.service
Source41: htcacheclean.sysconf Source41: htcacheclean.sysconf
Source42: status-info.conf
# build/scripts patches # build/scripts patches
Patch1: httpd-2.4.1-apctl.patch Patch1: httpd-2.4.1-apctl.patch
Patch2: httpd-2.4.9-apxs.patch Patch2: httpd-2.4.9-apxs.patch
@@ -298,6 +299,7 @@ done
mkdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d \ mkdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d \
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d \ $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d \
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/vhosts.d $RPM_BUILD_ROOT%{_sysconfdir}/httpd/vhosts.d
install -m 644 %{S:42} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/status-info.conf
install -m 644 %{S:29} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/00-vhosts.conf install -m 644 %{S:29} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/00-vhosts.conf
install -m 644 $RPM_SOURCE_DIR/README.confd \ install -m 644 $RPM_SOURCE_DIR/README.confd \
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/README $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/README
@@ -685,6 +687,9 @@ rm -rf $RPM_BUILD_ROOT
%{_rpmconfigdir}/macros.d/macros.httpd %{_rpmconfigdir}/macros.d/macros.httpd
%changelog %changelog
* Wed Mar 14 2018 Daniel Steiner <dsteiner@redhat.com> - 2.4.29-2
- status-info.conf added.
* Tue Feb 13 2018 Daniel Steiner <dsteiner@redhat.com> - 2.4.29-1 * Tue Feb 13 2018 Daniel Steiner <dsteiner@redhat.com> - 2.4.29-1
- new version 2.4.29 - new version 2.4.29