From 4030b4cf951cfaff908aba86c271417b98fd59fe Mon Sep 17 00:00:00 2001 From: remi Date: Apr 22 2012 06:44:44 +0000 Subject: add upstream patch to fix build --- diff --git a/pylibmc-build.patch b/pylibmc-build.patch new file mode 100644 index 0000000..98b8ba0 --- /dev/null +++ b/pylibmc-build.patch @@ -0,0 +1,38 @@ +--- _pylibmcmodule.c.orig 2012-04-22 08:33:26.000000000 +0200 ++++ _pylibmcmodule.c 2012-04-22 08:40:30.000000000 +0200 +@@ -65,7 +65,7 @@ + + static void PylibMC_ClientType_dealloc(PylibMC_Client *self) { + if (self->mc != NULL) { +-#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT ++#if LIBMEMCACHED_WITH_SASL_SUPPORT + if (self->sasl_set) { + memcached_destroy_sasl_auth_data(self->mc); + } +@@ -98,7 +98,7 @@ + /* setup sasl */ + if (user != NULL || pass != NULL) { + +-#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT ++#if LIBMEMCACHED_WITH_SASL_SUPPORT + if (user == NULL || pass == NULL) { + PyErr_SetString(PyExc_TypeError, "SASL requires both username and password"); + goto error; +@@ -2014,7 +2014,7 @@ + } + + static int _init_sasl(void) { +-#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT ++#if LIBMEMCACHED_WITH_SASL_SUPPORT + int rc; + + /* sasl_client_init needs to be called once before using SASL, and +@@ -2163,7 +2163,7 @@ + PyModule_AddStringConstant(module, + "libmemcached_version", LIBMEMCACHED_VERSION_STRING); + +-#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT ++#if LIBMEMCACHED_WITH_SASL_SUPPORT + PyModule_ADD_REF(module, "support_sasl", Py_True); + #else + PyModule_ADD_REF(module, "support_sasl", Py_False); diff --git a/python-pylibmc.spec b/python-pylibmc.spec index 977a2b8..955073c 100644 --- a/python-pylibmc.spec +++ b/python-pylibmc.spec @@ -15,6 +15,9 @@ URL: http://sendapatch.se/projects/pylibmc/ # git archive --format=tar HEAD | xz > {name}-{version}.{git_date}git{git_version}.tar.xz Source0: %{name}-%{version}.%{git_date}git%{git_version}.tar.xz +# https://github.com/lericson/pylibmc/commit/013ba5f610951d6c322a99d780aca6713f314140 +Patch0: pylibmc-build.patch + BuildRequires: python-devel BuildRequires: python-setuptools BuildRequires: libmemcached-devel @@ -29,6 +32,9 @@ so that applications can drop-in replace it. %prep %setup -q -cn %{name} +%patch0 -p0 -b .fixbuild + + %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %{?filter_setup: @@ -51,6 +57,7 @@ chmod 755 $RPM_BUILD_ROOT%{python_sitearch}/_pylibmc.so %changelog * Sun Apr 22 2012 Remi Collet - 1.2.0-7.20110805gitf01c31 - rebuild against libmemcached.so.10 +- add upstream patch to fix build * Sat Mar 03 2012 Remi Collet - 1.2.0-6.20110805gitf01c31 - rebuild against libmemcached.so.9