spec file cleanups

This commit is contained in:
Joe Orton 2012-11-22 12:38:50 +00:00
parent 6e3a0df92d
commit 069a5e0533
4 changed files with 27 additions and 3 deletions

View File

@ -1,3 +1,10 @@
Fix scoreboard handling.
https://bugzilla.redhat.com/show_bug.cgi?id=867276
http://code.google.com/p/modwsgi/source/detail?path=/mod_wsgi.c&name=mod_wsgi-3.X&r=bdbeacb88f348909845445e9d52eb7be401abaf1
--- mod_wsgi-3.4/mod_wsgi.c.connsbh
+++ mod_wsgi-3.4/mod_wsgi.c
@@ -10600,7 +10600,13 @@ static void wsgi_process_socket(apr_pool

View File

@ -1,3 +1,8 @@
Enable core dumps. In upstream 3.x branch:
http://code.google.com/p/modwsgi/source/detail?r=b4f55d756fa816a7eae0f7edc13d5f2da3f3d5c1&name=mod_wsgi-3.X&path=/mod_wsgi.c#
--- mod_wsgi-3.4/configure.ac.dumpcore
+++ mod_wsgi-3.4/configure.ac
@@ -39,6 +39,8 @@ fi

View File

@ -1,3 +1,8 @@
Log exit status in daemon manager; improves diagnosics.
http://code.google.com/p/modwsgi/source/detail?path=/mod_wsgi.c&name=mod_wsgi-3.X&r=b4f55d756fa816a7eae0f7edc13d5f2da3f3d5c1
--- mod_wsgi-3.3/mod_wsgi.c.procexit
+++ mod_wsgi-3.3/mod_wsgi.c
@@ -9845,6 +9845,20 @@ static void wsgi_manage_process(int reas

View File

@ -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: 5%{?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 %{_libdir}/httpd/modules/.*\.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,6 +40,7 @@ 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}"
%configure --enable-shared --with-apxs=%{_httpd_apxs}
@ -67,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Nov 22 2012 Joe Orton <jorton@redhat.com> - 3.4-5
- spec file cleanups
* Wed Oct 17 2012 Joe Orton <jorton@redhat.com> - 3.4-4
- enable PR_SET_DUMPABLE in daemon process to enable core dumps