From f7d882dd4b5b37e4f7f107b6082fa67712c64acc Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: May 21 2019 18:16:31 +0000 Subject: Remove index.html, add centos-noindex-8.0.tar.gz --- diff --git a/.gitignore b/.gitignore index 2c3e956..4c70af4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ SOURCES/htcacheclean.service.xml SOURCES/httpd-2.4.37.tar.bz2 SOURCES/httpd.conf.xml SOURCES/httpd.service.xml +SOURCES/centos-noindex-8.0.tar.gz diff --git a/.httpd.metadata b/.httpd.metadata index 091ca86..57219c4 100644 --- a/.httpd.metadata +++ b/.httpd.metadata @@ -2,3 +2,4 @@ a34c31169efbe6140496c37801489610461bdf9b SOURCES/htcacheclean.service.xml 4a38471de821288b0300148016f2b03dfee8adf2 SOURCES/httpd-2.4.37.tar.bz2 fa18caadd0afbddc2c7a7fc404bf4f2b41867148 SOURCES/httpd.conf.xml 888df830bdc465de3bced6f075c33380018e544f SOURCES/httpd.service.xml +4e9991ee6accab483b21b96922392d38e521864c SOURCES/centos-noindex-8.0.tar.gz diff --git a/SPECS/httpd.spec b/SPECS/httpd.spec index 3e7845f..b10fb87 100644 --- a/SPECS/httpd.spec +++ b/SPECS/httpd.spec @@ -13,10 +13,10 @@ Summary: Apache HTTP Server Name: httpd Version: 2.4.37 -Release: 11%{?dist} +Release: 12%{?dist} URL: https://httpd.apache.org/ Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 -Source1: index.html +Source1: centos-noindex-8.0.tar.gz Source2: httpd.logrotate Source3: instance.conf Source4: httpd-ssl-pass-dialog @@ -479,8 +479,7 @@ EOF # Handle contentdir mkdir $RPM_BUILD_ROOT%{contentdir}/noindex -install -m 644 -p $RPM_SOURCE_DIR/index.html \ - $RPM_BUILD_ROOT%{contentdir}/noindex/index.html +tar xzf %{SOURCE1} -C $RPM_BUILD_ROOT%{contentdir}/noindex/ --strip-components=1 rm -rf %{contentdir}/htdocs # remove manual sources @@ -695,7 +694,7 @@ rm -rf $RPM_BUILD_ROOT %{contentdir}/error/README %{contentdir}/error/*.var %{contentdir}/error/include/*.html -%{contentdir}/noindex/index.html +%{contentdir}/noindex/* %attr(0710,root,apache) %dir /run/httpd %attr(0700,apache,apache) %dir /run/httpd/htcacheclean @@ -784,6 +783,9 @@ rm -rf $RPM_BUILD_ROOT %{_rpmconfigdir}/macros.d/macros.httpd %changelog +* Tue May 21 2019 Alain Reguera Delgado - 2.4.37-12.el8.centos +- Remove index.html, add centos-noindex-8.0.tar.gz + * Tue May 07 2019 CentOS Sources - 2.4.37-11.el8.centos - Apply debranding changes