update to 4.6.4 and fix FTBFS

This commit is contained in:
Matthias Runge 2018-07-20 16:39:18 +02:00
parent 847fbd48d8
commit e7833de5f4
3 changed files with 8 additions and 12 deletions

1
.gitignore vendored
View File

@ -15,3 +15,4 @@ mod_wsgi-3.2.tar.gz
/mod_wsgi-4.5.15.tar.gz
/mod_wsgi-4.5.20.tar.gz
/mod_wsgi-4.6.2.tar.gz
/mod_wsgi-4.6.4.tar.gz

View File

@ -22,8 +22,8 @@
%endif
Name: mod_wsgi
Version: 4.6.2
Release: 5%{?dist}
Version: 4.6.4
Release: 1%{?dist}
Summary: A WSGI interface for Python web applications in Apache
Group: System Environment/Libraries
License: ASL 2.0
@ -86,10 +86,6 @@ Obsoletes: mod_wsgi < %{version}-%{release}
%setup -qn %{name}-%{version}
%patch1 -p1 -b .exports
%if 0%{?with_python3} > 0
cp -a . %{py3dir}
%endif
%build
make -C docs html SPHINXBUILD=%{sphinxbin}
@ -97,24 +93,21 @@ export LDFLAGS="$RPM_LD_FLAGS -L%{_libdir}"
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%if 0%{?with_python2} > 0
%configure --enable-shared --with-apxs=%{_httpd_apxs}
%configure --enable-shared --with-apxs=%{_httpd_apxs} --with-python=python2
make %{?_smp_mflags}
%py2_build
%endif
%if 0%{?with_python3} > 0
pushd %{py3dir}
%configure --enable-shared --with-apxs=%{_httpd_apxs} --with-python=python3
make %{?_smp_mflags}
%py3_build
popd
%endif
%install
# first install python3 variant and rename the so file
%if 0%{?with_python3} > 0
pushd %{py3dir}
make install DESTDIR=$RPM_BUILD_ROOT LIBEXECDIR=%{_httpd_moddir}
mv $RPM_BUILD_ROOT%{_httpd_moddir}/mod_wsgi{,_python3}.so
@ -124,7 +117,6 @@ install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_httpd_modconfdir}/10-wsgi-python3
%py3_install
mv $RPM_BUILD_ROOT%{_bindir}/mod_wsgi-express{,-3}
popd
%endif
@ -165,6 +157,9 @@ ln -s %{_bindir}/mod_wsgi-express-2 $RPM_BUILD_ROOT%{_bindir}/mod_wsgi-express
%endif
%changelog
* Fri Jul 20 2018 Matthias Runge <mrunge@redhat.com> - 4.6.4-1
- update to 4.6.4 (rhbz#1560329)
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (mod_wsgi-4.6.2.tar.gz) = 584eccbdbdc76a889ee1dbd7ec44ea20dac0e1e28f3a5f1e2cbc5c9006fc0e6e1bb04a7fa754d08ff2d4e6e9b9cbe9e96de427c0f5685629f2e577aa7793684f
SHA512 (mod_wsgi-4.6.4.tar.gz) = 9c4da5bd963b2fa88dbdffa4b3e9f3711c5a2c506a5f92fa28ada1688d20eae9ce1ab76ce9569dcea8fbf9c8331009ba34a9f8bae1b5b93f15d3de7b1644fac5