diff --git a/mod_wsgi.spec b/mod_wsgi.spec index 53b6c28..363d7d4 100644 --- a/mod_wsgi.spec +++ b/mod_wsgi.spec @@ -8,8 +8,10 @@ %if 0%{?fedora} || 0%{?rhel} > 7 %global with_python3 1 +%global sphinxbin %{_bindir}/sphinx-build-3 %else %global with_python3 0 +%global sphinxbin %{_bindir}/sphinx-build %endif %if 0%{?fedora} || 0%{?rhel} <= 7 @@ -21,7 +23,7 @@ Name: mod_wsgi Version: 4.6.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A WSGI interface for Python web applications in Apache Group: System Environment/Libraries License: ASL 2.0 @@ -32,7 +34,6 @@ Source2: wsgi-python3.conf Patch1: mod_wsgi-4.5.20-exports.patch BuildRequires: httpd-devel -BuildRequires: python-sphinx BuildRequires: gcc # Suppress auto-provides for module DSO @@ -55,7 +56,7 @@ existing WSGI adapters for mod_python or CGI.\ %package -n python2-%{name} Summary: %summary Requires: httpd-mmn = %{_httpd_mmn} -BuildRequires: python2-devel +BuildRequires: python2-devel, python2-sphinx %{?python_provide:%python_provide python2-%{name}} # Remove before F30 Provides: mod_wsgi = %{version}-%{release} @@ -70,7 +71,7 @@ Obsoletes: mod_wsgi < %{version}-%{release} %package -n python3-%{name} Summary: %summary Requires: httpd-mmn = %{_httpd_mmn} -BuildRequires: python3-devel +BuildRequires: python3-devel, python3-sphinx %if 0%{?with_python2} == 0 Provides: mod_wsgi = %{version}-%{release} Provides: mod_wsgi%{?_isa} = %{version}-%{release} @@ -90,7 +91,7 @@ cp -a . %{py3dir} %endif %build -make -C docs html +make -C docs html SPHINXBUILD=%{sphinxbin} export LDFLAGS="$RPM_LD_FLAGS -L%{_libdir}" export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -164,6 +165,9 @@ ln -s %{_bindir}/mod_wsgi-express-2 $RPM_BUILD_ROOT%{_bindir}/mod_wsgi-express %endif %changelog +* Fri Apr 20 2018 Joe Orton - 4.6.2-3 +- use sphinx-build-3 if python2 support is disabled + * Thu Mar 22 2018 Troy Dawson - 4.6.2-2 - Update conditionals. - Make preperations for non-python2 builds