require mod_http2, now packaged separately

3 files changed, 9 insertions, 6 deletions

diff --git a/00-base.conf b/00-base.conf
index e99ff0e..ec9acf1 100644
--- a/00-base.conf
+++ b/00-base.conf
@@ -37,7 +37,6 @@ LoadModule expires_module modules/mod_expires.so
 LoadModule ext_filter_module modules/mod_ext_filter.so
 LoadModule filter_module modules/mod_filter.so
 LoadModule headers_module modules/mod_headers.so
-LoadModule http2_module modules/mod_http2.so
 LoadModule include_module modules/mod_include.so
 LoadModule info_module modules/mod_info.so
 LoadModule log_config_module modules/mod_log_config.so
diff --git a/httpd.spec b/httpd.spec
index c91e4ea..ccae88e 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -8,7 +8,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.4.25
-Release: 7%{?dist}
+Release: 8%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source1: index.html
@@ -78,7 +78,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: autoconf, perl, perl-generators, pkgconfig, findutils, xmlto
 BuildRequires: zlib-devel, libselinux-devel, lua-devel
 BuildRequires: apr-devel >= 1.5.0, apr-util-devel >= 1.5.0, pcre-devel >= 5.0
-BuildRequires: systemd-devel, libnghttp2-devel
+BuildRequires: systemd-devel
 Requires: /etc/mime.types, system-logos-httpd
 Obsoletes: httpd-suexec
 Provides: webserver
@@ -86,7 +86,7 @@ Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release}
 Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}
 Requires: httpd-tools = %{version}-%{release}
 Requires: httpd-filesystem = %{version}-%{release}
-Requires: nghttp2 >= 1.5.0
+Requires: mod_http2
 Requires(pre): httpd-filesystem
 Requires(preun): systemd-units
 Requires(postun): systemd-units
@@ -287,7 +287,8 @@ export LYNX_PATH=/usr/bin/links
         --enable-ldap --enable-authnz-ldap \
         --enable-cgid --enable-cgi \
         --enable-authn-anon --enable-authn-alias \
-        --disable-imagemap --disable-file-cache
+        --disable-imagemap --disable-file-cache \
+        --disable-http2 \
 	$*
 make %{?_smp_mflags}
 
@@ -690,6 +691,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_rpmconfigdir}/macros.d/macros.httpd
 
 %changelog
+* Tue May 16 2017 Joe Orton <jorton@redhat.com> - 2.4.25-8
+- require mod_http2, now packaged separately
+
 * Wed Mar 29 2017 Luboš Uhliarik <luhliari@redhat.com> - 2.4.25-7
 - Resolves: #1397243 - Backport Apache Bug 53098 - mod_proxy_ajp:
   patch to set worker secret passed to tomcat
diff --git a/pullrev.sh b/pullrev.sh
index 8b60efa..2b2fef9 100755
--- a/pullrev.sh
+++ b/pullrev.sh
@@ -6,7 +6,7 @@ if [ $# -lt 1 ]; then
 fi
 
 repo="https://svn.apache.org/repos/asf/httpd/httpd/trunk"
-#repo="https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x"
+repo="https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x"
 ver=2.4.25
 prefix="httpd-${ver}"
 suffix="r$1${2:++}"