From 28153dbcc10727f155e28cc9a0865d918570e03e Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Wed, 31 Mar 2021 14:11:00 +0200 Subject: [PATCH] Resolves: #1934739 - Apache trademark update - new logo --- apache-poweredby.png | Bin 0 -> 5714 bytes httpd.spec | 12 ++++++++++-- welcome.conf | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 apache-poweredby.png diff --git a/apache-poweredby.png b/apache-poweredby.png new file mode 100644 index 0000000000000000000000000000000000000000..5663a23ad527e8983d82529485a0dc7f33230a08 GIT binary patch literal 5714 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 Ef>Uh;{Qv*} literal 0 HcmV?d00001 diff --git a/httpd.spec b/httpd.spec index 233a247..7837c37 100644 --- a/httpd.spec +++ b/httpd.spec @@ -13,7 +13,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.4.46 -Release: 10%{?dist} +Release: 11%{?dist} URL: https://httpd.apache.org/ Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source1: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2.asc @@ -60,6 +60,7 @@ Source44: httpd@.service Source45: config.layout Source46: apachectl.sh Source47: apachectl.xml +Source48: apache-poweredby.png # build/scripts patches Patch2: httpd-2.4.43-apxs.patch @@ -100,7 +101,7 @@ BuildRequires: perl-interpreter, perl-generators, systemd-devel BuildRequires: zlib-devel, libselinux-devel, lua-devel, brotli-devel BuildRequires: apr-devel >= 1.5.0, apr-util-devel >= 1.5.0, pcre-devel >= 5.0 BuildRequires: gnupg2 -Requires: /etc/mime.types, system-logos-httpd +Requires: /etc/mime.types, system-logos-httpd >= 34.0.1 Provides: webserver Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release} Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa} @@ -270,6 +271,9 @@ if test "x${vmmn}" != "x%{mmn}"; then exit 1 fi +# A new logo which comes together with a new test page +cp %{SOURCE48} ./docs/icons/apache_pb3.png + # Provide default layout cp $RPM_SOURCE_DIR/config.layout . @@ -485,6 +489,7 @@ rm -v $RPM_BUILD_ROOT%{docroot}/html/*.html \ ln -s ../../pixmaps/poweredby.png \ $RPM_BUILD_ROOT%{contentdir}/icons/poweredby.png + # symlinks for /etc/httpd rmdir $RPM_BUILD_ROOT/etc/httpd/{state,run} ln -s ../..%{_localstatedir}/log/httpd $RPM_BUILD_ROOT/etc/httpd/logs @@ -781,6 +786,9 @@ exit $rv %{_rpmconfigdir}/macros.d/macros.httpd %changelog +* Wed Mar 31 2021 Lubos Uhliarik - 2.4.46-11 +- Resolves: #1934739 - Apache trademark update - new logo + * Tue Feb 23 2021 Joe Orton - 2.4.46-10 - add Conflicts: with mod_nss - drop use of apr_ldap_rebind (r1878890, #1847585) diff --git a/welcome.conf b/welcome.conf index b279c2f..a5e221b 100644 --- a/welcome.conf +++ b/welcome.conf @@ -16,4 +16,4 @@ Alias /.noindex.html /usr/share/httpd/noindex/index.html -Alias /poweredby.png /usr/share/httpd/icons/apache_pb2.png +Alias /poweredby.png /usr/share/httpd/icons/apache_pb3.png