|
12 | 12 |
|
13 | 13 | %if 0%{?rhel} >= 7
|
14 | 14 | %bcond_without systemd
|
| 15 | +%bcond_without brotli |
15 | 16 | %else
|
16 | 17 | %bcond_with systemd
|
| 18 | +%bcond_with brotli |
17 | 19 | %endif
|
18 | 20 |
|
19 | 21 | # Drop automatic provides for module DSOs
|
|
23 | 25 | Summary: Apache HTTP Server
|
24 | 26 | Name: httpd24u
|
25 | 27 | Version: 2.4.39
|
26 |
| -Release: 1%{?dist} |
| 28 | +Release: 2%{?dist} |
27 | 29 | URL: https://httpd.apache.org/
|
28 | 30 | Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
|
29 | 31 | Source2: httpd.logrotate
|
@@ -90,6 +92,9 @@ License: ASL 2.0
|
90 | 92 | Group: System Environment/Daemons
|
91 | 93 | BuildRequires: autoconf, perl, pkgconfig, findutils, xmlto
|
92 | 94 | BuildRequires: zlib-devel, libselinux-devel, lua-devel
|
| 95 | +%if %{with brotli} |
| 96 | +BuildRequires: brotli-devel |
| 97 | +%endif |
93 | 98 | BuildRequires: %{apr}-devel >= 1.5.0, %{apr}-util-devel >= 1.5.0, pcre-devel >= 5.0
|
94 | 99 | BuildRequires: libnghttp2-devel
|
95 | 100 | %{?with_systemd:BuildRequires: systemd-devel}
|
@@ -354,6 +359,9 @@ export LYNX_PATH=/usr/bin/links
|
354 | 359 | --with-suexec-syslog \
|
355 | 360 | --with-suexec-bin=%{_sbindir}/suexec \
|
356 | 361 | --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
|
| 362 | + %if %{with brotli} |
| 363 | + --with-brotli \ |
| 364 | + %endif |
357 | 365 | --enable-pie \
|
358 | 366 | --with-pcre \
|
359 | 367 | --enable-mods-shared=all \
|
@@ -402,6 +410,11 @@ for f in 00-base.conf 00-mpm.conf 00-lua.conf 01-cgi.conf 00-dav.conf \
|
402 | 410 | $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/$f
|
403 | 411 | done
|
404 | 412 |
|
| 413 | +# remove brotli module config if disabled |
| 414 | +%if %{without brotli} |
| 415 | +sed -e '/brotli_module/d' -i $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/00-base.conf |
| 416 | +%endif |
| 417 | + |
405 | 418 | %if %{with systemd}
|
406 | 419 | # install systemd override drop directory
|
407 | 420 | # Web application packages can drop snippets into this location if
|
@@ -813,6 +826,9 @@ exit $rv
|
813 | 826 |
|
814 | 827 |
|
815 | 828 | %changelog
|
| 829 | +* Thu Jun 13 2019 Carl George <[email protected]> - 2.4.39-2 |
| 830 | +- Enable mod_brotli |
| 831 | + |
816 | 832 | * Tue Apr 02 2019 Carl George <[email protected]> - 2.4.39-1.ius
|
817 | 833 | - Latest upstream
|
818 | 834 |
|
|
0 commit comments