From 241a680c246d91f55a733aa1f45a480697c28ff4 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Oct 20 2017 16:44:57 +0000
Subject: update to 4.5.20

Resolves: rhbz#1468789
Resolves: rhbz#1479253

---

diff --git a/.gitignore b/.gitignore
index 9688f44..6ab44ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ mod_wsgi-3.2.tar.gz
 /mod_wsgi-4.5.9.tar.gz
 /mod_wsgi-4.5.13.tar.gz
 /mod_wsgi-4.5.15.tar.gz
+/mod_wsgi-4.5.20.tar.gz
diff --git a/mod_wsgi.spec b/mod_wsgi.spec
index 6692840..e1b571b 100644
--- a/mod_wsgi.spec
+++ b/mod_wsgi.spec
@@ -13,8 +13,8 @@
 %endif
 
 Name:           mod_wsgi
-Version:        4.5.15
-Release:        4%{?dist}
+Version:        4.5.20
+Release:        1%{?dist}
 Summary:        A WSGI interface for Python web applications in Apache
 Group:          System Environment/Libraries
 License:        ASL 2.0
@@ -23,9 +23,8 @@ Source0:        https://github.com/GrahamDumpleton/mod_wsgi/archive/%{version}.t
 Source1:        wsgi.conf
 Source2:        wsgi-python3.conf
 
-BuildRequires:  httpd-devel
-BuildRequires:  python-devel
-BuildRequires:  autoconf
+BuildRequires:  httpd-devel, python-devel
+BuildRequires:  python2-sphinx
 Requires:       httpd-mmn = %{_httpd_mmn}
 
 # Suppress auto-provides for module DSO
@@ -65,15 +64,19 @@ cp -a . %{py3dir}
 %endif
 
 %build
+make -C docs html
+
 export LDFLAGS="$RPM_LD_FLAGS -L%{_libdir}"
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %configure --enable-shared --with-apxs=%{_httpd_apxs}
 make %{?_smp_mflags}
+%py2_build
 
 %if 0%{?with_python3} > 0
 pushd %{py3dir}
 %configure --enable-shared --with-apxs=%{_httpd_apxs} --with-python=python3
 make %{?_smp_mflags}
+%py3_build
 popd
 %endif
 
@@ -88,6 +91,9 @@ mv  $RPM_BUILD_ROOT%{_httpd_moddir}/mod_wsgi{,_python3}.so
 install -d -m 755 $RPM_BUILD_ROOT%{_httpd_modconfdir}
 # httpd >= 2.4.x
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_httpd_modconfdir}/10-wsgi-python3.conf
+
+%py3_install
+mv $RPM_BUILD_ROOT%{_bindir}/mod_wsgi-express{,-3}
 popd
 
 %endif
@@ -98,11 +104,19 @@ install -d -m 755 $RPM_BUILD_ROOT%{_httpd_modconfdir}
 # httpd >= 2.4.x
 install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_httpd_modconfdir}/10-wsgi.conf
 
+%py2_install
+mv $RPM_BUILD_ROOT%{_bindir}/mod_wsgi-express{,-2}
+ln -s %{_bindir}/mod_wsgi-express-2 $RPM_BUILD_ROOT%{_bindir}/mod_wsgi-express
+
 %files
 %license LICENSE
 %doc CREDITS.rst README.rst
 %config(noreplace) %{_httpd_modconfdir}/*wsgi.conf
 %{_httpd_moddir}/mod_wsgi.so
+%{python2_sitearch}/mod_wsgi-*.egg-info
+%{python2_sitearch}/mod_wsgi
+%{_bindir}/mod_wsgi-express-2
+%{_bindir}/mod_wsgi-express
 
 %if 0%{?with_python3} > 0
 %files -n python3-%{name}
@@ -110,9 +124,18 @@ install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_httpd_modconfdir}/10-wsgi.conf
 %doc CREDITS.rst README.rst
 %config(noreplace) %{_httpd_modconfdir}/*wsgi-python3.conf
 %{_httpd_moddir}/mod_wsgi_python3.so
+%{python3_sitearch}/mod_wsgi-*.egg-info
+%{python3_sitearch}/mod_wsgi
+%{_bindir}/mod_wsgi-express-3
 %endif
 
 %changelog
+* Fri Oct 20 2017 Joe Orton <jorton@redhat.com> - 4.5.20-1
+- update to 4.5.20
+
+* Wed Aug 09 2017 Dan Callaghan <dcallagh@redhat.com> - 4.5.15-5
+- include mod_wsgi Python package and mod_wsgi-express script
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.15-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/sources b/sources
index ccb09e3..e0e4756 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mod_wsgi-4.5.15.tar.gz) = 35690cb5ef1c8d8a2c071bb8ac08de3dcb2107007b6319b2f01a697334231ce9d222c3ecd49285bc061405a4a2759b24e5140de8fef0bce7cce67936eb99ef45
+SHA512 (mod_wsgi-4.5.20.tar.gz) = abe51e3c046df0b381024a449ed7eb21c86c98ca7b27e81fccb40a831bf68e7489c75175996b25087e826fc0c6c4d8b79ab6a9c11f22e3fcbb8c484bb27b1266