From cba37f9aba04e0f99471bbf4524939637f251fbb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 13 Feb 2013 14:43:05 +0100 Subject: mod_wsgi: sync with rawhde --- mod_wsgi.spec | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/mod_wsgi.spec b/mod_wsgi.spec index 486bfe4..1c27e86 100644 --- a/mod_wsgi.spec +++ b/mod_wsgi.spec @@ -3,12 +3,12 @@ %{!?_httpd_confdir: %{expand: %%global _httpd_confdir %%{_sysconfdir}/httpd/conf.d}} # /etc/httpd/conf.d with httpd < 2.4 and defined as /etc/httpd/conf.modules.d with httpd >= 2.4 %{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}} +%{!?_httpd_moddir: %{expand: %%global _httpd_moddir %%{_libdir}/httpd/modules}} Name: mod_wsgi Version: 3.4 -Release: 4%{?dist} +Release: 7%{?dist} Summary: A WSGI interface for Python web applications in Apache - Group: System Environment/Libraries License: ASL 2.0 URL: http://modwsgi.org @@ -18,10 +18,13 @@ Patch0: mod_wsgi-3.4-connsbh.patch Patch1: mod_wsgi-3.4-procexit.patch Patch2: mod_wsgi-3.4-coredump.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildRequires: httpd-devel, python-devel, autoconf Requires: httpd-mmn = %{_httpd_mmn} +# Suppress auto-provides for module DSO +%{?filter_provides_in: %filter_provides_in %{_httpd_moddir}/.*\.so$} +%{?filter_setup} + %description The mod_wsgi adapter is an Apache module that provides a WSGI compliant interface for hosting Python based web applications within Apache. The @@ -37,15 +40,17 @@ existing WSGI adapters for mod_python or CGI. %patch2 -p1 -b .coredump %build +# Regenerate configure for -coredump patch change to configure.in autoconf 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} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT LIBEXECDIR=%{_httpd_moddir} install -d -m 755 $RPM_BUILD_ROOT%{_httpd_modconfdir} %if "%{_httpd_modconfdir}" == "%{_httpd_confdir}" @@ -63,10 +68,23 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc LICENCE README %config(noreplace) %{_httpd_modconfdir}/*.conf -%{_libdir}/httpd/modules/mod_wsgi.so +%{_httpd_moddir}/mod_wsgi.so %changelog +* Wed Feb 13 2013 Remi Collet - 3.4-7 +- sync with rawhide, rebuild for remi repo + +* Tue Dec 11 2012 Jan Kaluza - 3.4-7 +- compile with -fno-strict-aliasing to workaround Python + bug http://www.python.org/dev/peps/pep-3123/ + +* Thu Nov 22 2012 Joe Orton - 3.4-6 +- use _httpd_moddir macro + +* Thu Nov 22 2012 Joe Orton - 3.4-5 +- spec file cleanups + * Sat Nov 17 2012 Remi Collet - 3.4-4 - sync with rawhide, rebuild for remi repo -- cgit