Attachment 9766 Details for Bug 21915 – Patch for apache spec

[patch] Patch for apache spec

apache.spec.patch (text/plain), 2.44 KB, created by Marc Krämer on 2017-10-29 01:04:01 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Krämer

Created: 2017-10-29 01:04:01 CEST

Size: 2.44 KB

patch

obsolete

>Index: SPECS/apache.spec
>===================================================================
>--- SPECS/apache.spec	(Revision 1174484)
>+++ SPECS/apache.spec	(Arbeitskopie)
>@@ -7,6 +7,7 @@
> %define docroot /var/www
> %define suexec_caller apache
> %define vstring Mageia
>+%define brotlienclib	%mklibname brotlienc 1.0.1
> 
> %{?!maxmodules:%global maxmodules 128}
> %{?!serverlimit:%global serverlimit 1024}
>@@ -44,6 +45,7 @@
> Source43:   mod_systemd.conf
> Source44:   mod_session.conf
> Source45:   mod_http2.conf
>+Source46:   mod_brotli.conf
> 
> Source50:   httpd-security.conf
> Source51:   httpd-ssl.conf
>@@ -170,6 +172,7 @@
> BuildRequires:  pkgconfig(systemd)
> BuildRequires:  multiarch-utils >= 1.0.3
> BuildRequires:  pkgconfig(libnghttp2) >= 1.8.0
>+BuildRequires:  pkgconfig(libbrotlienc)
> 
> %description
> This package contains the main binary of apache, a powerful, full-featured,
>@@ -363,6 +366,20 @@
> 
> This module relies on libnghttp2 to provide the core http/2 engine.
> 
>+%package    mod_brotli
>+Summary:    Google Brotli compression for apache
>+Group:      System/Servers
>+# ensure initscript presence
>+Requires(post): apache
>+Requires(postun): apache
>+Requires:   apache >= %{version}-%{release}
>+Requires:   %{brotlienclib}
>+Provides:   apache-mod_brotli = %{version}
>+
>+%description    mod_brotli
>+The mod_brotli module provides the BROTLI_COMPRESS output filter that allows output from your server to be compressed using the brotli compression format before being sent to the client over the network. This module uses the Brotli library found at https://github.com/google/brotli.
>+
>+
> %package    htcacheclean
> Summary:    Clean up the disk cache (for apache-mod_disk_cache)
> Group:      System/Servers
>@@ -585,6 +602,7 @@
> install -m 644 %{SOURCE43} %{buildroot}%{confdir}/modules.d/00_mod_systemd.conf
> install -m 644 %{SOURCE44} %{buildroot}%{confdir}/modules.d/01_mod_session.conf
> install -m 644 %{SOURCE45} %{buildroot}%{confdir}/modules.d/01_mod_http2.conf
>+install -m 644 %{SOURCE46} %{buildroot}%{confdir}/modules.d/10_mod_brotli.conf
> 
> # generic server configuration files
> install -d -m 755 %{buildroot}%{confdir}/conf.d
>@@ -991,6 +1009,10 @@
> %config(noreplace) %{confdir}/modules.d/01_mod_http2.conf
> %{_libdir}/httpd/modules/mod_http2.so
> 
>+%files mod_brotli
>+%config(noreplace) %{confdir}/modules.d/10_mod_brotli.conf
>+%{_libdir}/httpd/modules/mod_brotli.so
>+
> %files htcacheclean
> %{_unitdir}/htcacheclean.service
> %config(noreplace) %{_sysconfdir}/sysconfig/htcacheclean

Index: SPECS/apache.spec
===================================================================
--- SPECS/apache.spec	(Revision 1174484)
+++ SPECS/apache.spec	(Arbeitskopie)
@@ -7,6 +7,7 @@
 %define docroot /var/www
 %define suexec_caller apache
 %define vstring Mageia
+%define brotlienclib	%mklibname brotlienc 1.0.1
 
 %{?!maxmodules:%global maxmodules 128}
 %{?!serverlimit:%global serverlimit 1024}
@@ -44,6 +45,7 @@
 Source43:   mod_systemd.conf
 Source44:   mod_session.conf
 Source45:   mod_http2.conf
+Source46:   mod_brotli.conf
 
 Source50:   httpd-security.conf
 Source51:   httpd-ssl.conf
@@ -170,6 +172,7 @@
 BuildRequires:  pkgconfig(systemd)
 BuildRequires:  multiarch-utils >= 1.0.3
 BuildRequires:  pkgconfig(libnghttp2) >= 1.8.0
+BuildRequires:  pkgconfig(libbrotlienc)
 
 %description
 This package contains the main binary of apache, a powerful, full-featured,
@@ -363,6 +366,20 @@
 
 This module relies on libnghttp2 to provide the core http/2 engine.
 
+%package    mod_brotli
+Summary:    Google Brotli compression for apache
+Group:      System/Servers
+# ensure initscript presence
+Requires(post): apache
+Requires(postun): apache
+Requires:   apache >= %{version}-%{release}
+Requires:   %{brotlienclib}
+Provides:   apache-mod_brotli = %{version}
+
+%description    mod_brotli
+The mod_brotli module provides the BROTLI_COMPRESS output filter that allows output from your server to be compressed using the brotli compression format before being sent to the client over the network. This module uses the Brotli library found at https://github.com/google/brotli.
+
+
 %package    htcacheclean
 Summary:    Clean up the disk cache (for apache-mod_disk_cache)
 Group:      System/Servers
@@ -585,6 +602,7 @@
 install -m 644 %{SOURCE43} %{buildroot}%{confdir}/modules.d/00_mod_systemd.conf
 install -m 644 %{SOURCE44} %{buildroot}%{confdir}/modules.d/01_mod_session.conf
 install -m 644 %{SOURCE45} %{buildroot}%{confdir}/modules.d/01_mod_http2.conf
+install -m 644 %{SOURCE46} %{buildroot}%{confdir}/modules.d/10_mod_brotli.conf
 
 # generic server configuration files
 install -d -m 755 %{buildroot}%{confdir}/conf.d
@@ -991,6 +1009,10 @@
 %config(noreplace) %{confdir}/modules.d/01_mod_http2.conf
 %{_libdir}/httpd/modules/mod_http2.so
 
+%files mod_brotli
+%config(noreplace) %{confdir}/modules.d/10_mod_brotli.conf
+%{_libdir}/httpd/modules/mod_brotli.so
+
 %files htcacheclean
 %{_unitdir}/htcacheclean.service
 %config(noreplace) %{_sysconfdir}/sysconfig/htcacheclean

Actions: View | Diff

Attachments on bug 21915: 9765 | 9766