From 40b375e4147975ec6e112dba9a7b1fcefe2ee67b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Thu, 5 Jul 2018 21:07:46 +0200 Subject: [PATCH] - rel 31; fix build --- apache-mod_python.spec | 4 +++- build.patch | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 build.patch diff --git a/apache-mod_python.spec b/apache-mod_python.spec index 6277a9c..cb09cf3 100644 --- a/apache-mod_python.spec +++ b/apache-mod_python.spec @@ -20,7 +20,7 @@ Summary(pl.UTF-8): Wbudowany interpreter języka Python dla serwera WWW Apache Summary(sv.UTF-8): En inbyggd Python-interpretator för webbservern Apache Name: apache-mod_%{mod_name} Version: 3.5.0 -Release: 30 +Release: 31 License: Apache Group: Networking/Daemons/HTTP Source0: http://dist.modpython.org/dist/mod_%{mod_name}-%{version}.tgz @@ -32,6 +32,7 @@ Patch1: no-git.patch Patch2: set-request-response-status.patch Patch3: install.patch Patch4: import.patch +Patch5: build.patch URL: http://www.modpython.org/ BuildRequires: apache-devel >= 2.0.52-7 BuildRequires: apr-devel >= 1:1.0.0 @@ -241,6 +242,7 @@ prestandan jämfört med den traditionella CGI-metoden. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build %{__aclocal} diff --git a/build.patch b/build.patch new file mode 100644 index 0000000..df82c11 --- /dev/null +++ b/build.patch @@ -0,0 +1,20 @@ +--- mod_python-3.5.0/src/_apachemodule.c~ 2013-11-12 04:21:34.000000000 +0100 ++++ mod_python-3.5.0/src/_apachemodule.c 2018-07-05 21:05:19.623844821 +0200 +@@ -836,7 +836,7 @@ static struct PyModuleDef _apache_module + + PyObject *_apache_module_init() + { +- PyObject *m, *d, *o; ++ PyObject *m, *d, *o, *mod; + + PyType_Ready(&MpTable_Type); + PyType_Ready(&MpTableIter_Type); +@@ -851,7 +851,7 @@ PyObject *_apache_module_init() + #else + m = PyModule_Create(&_apache_moduledef); + PyObject *name = PyUnicode_FromString("_apache"); +- _PyImport_FixupExtensionObject(m, name, name); ++ _PyImport_FixupExtensionObject(m, name, name, mod); + #endif + d = PyModule_GetDict(m); + Mp_ServerReturn = PyErr_NewException("_apache.SERVER_RETURN", NULL, NULL); -- 2.43.0