From cb43192e2cbf68a8746f34cce5bf778b22436e68 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Nov 14 2019 20:52:38 +0000 Subject: reapply centos branding --- 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..000b59a 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 +6aa65f45c247226fc922c455e0187abd90c839e8 SOURCES/centos-noindex-8.0.tar.gz diff --git a/SPECS/httpd.spec b/SPECS/httpd.spec index f58e649..7eaadd5 100644 --- a/SPECS/httpd.spec +++ b/SPECS/httpd.spec @@ -16,7 +16,7 @@ Version: 2.4.37 Release: 16%{?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 @@ -499,8 +499,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 @@ -716,7 +715,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