From cea91b03d55aabc926e0ab261d8905cfa70fb574b786e047d719ebedf18159b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 8 Aug 2018 13:28:23 +0000
Subject: [PATCH 1/2] - Version update to 1.59:   * Various fixes for python
 3.7 and 3.6 - Run tests

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-memcached?expand=0&rev=25
---
 1.59.tar.gz                     |  3 +++
 python-memcached-1.58.tar.gz    |  3 ---
 python-python-memcached.changes |  7 +++++++
 python-python-memcached.spec    | 27 +++++++++++++--------------
 4 files changed, 23 insertions(+), 17 deletions(-)
 create mode 100644 1.59.tar.gz
 delete mode 100644 python-memcached-1.58.tar.gz

diff --git a/1.59.tar.gz b/1.59.tar.gz
new file mode 100644
index 0000000..c1c3256
--- /dev/null
+++ b/1.59.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e39f5444b0eb5dcbdef1ce8f72bd73f3fb188a420fc33f23d039525efe523863
+size 32334
diff --git a/python-memcached-1.58.tar.gz b/python-memcached-1.58.tar.gz
deleted file mode 100644
index e62502d..0000000
--- a/python-memcached-1.58.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2775829cb54b9e4c5b3bbd8028680f0c0ab695db154b9c46f0f074ff97540eb6
-size 30562
diff --git a/python-python-memcached.changes b/python-python-memcached.changes
index 8d67940..aa64982 100644
--- a/python-python-memcached.changes
+++ b/python-python-memcached.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Aug  8 13:28:02 UTC 2018 - tchvatal@suse.com
+
+- Version update to 1.59:
+  * Various fixes for python 3.7 and 3.6
+- Run tests
+
 -------------------------------------------------------------------
 Thu Aug 24 13:52:44 UTC 2017 - jmatejek@suse.com
 
diff --git a/python-python-memcached.spec b/python-python-memcached.spec
index f6ee1b1..b4d3511 100644
--- a/python-python-memcached.spec
+++ b/python-python-memcached.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-python-memcached
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,23 +18,20 @@
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define oldpython python
-%bcond_with     test
 Name:           python-python-memcached
-Version:        1.58
+Version:        1.59
 Release:        0
 Summary:        Pure python memcached client
 License:        Python-2.0
 Group:          Development/Languages/Python
-Url:            http://www.tummy.com/Community/software/python-memcached/
-Source:         https://files.pythonhosted.org/packages/source/p/python-memcached/python-memcached-%{version}.tar.gz
-BuildRequires:  %{python_module devel}
+URL:            https://github.com/linsomniac/python-memcached
+Source:         https://github.com/linsomniac/python-memcached/archive/%{version}.tar.gz
+BuildRequires:  %{python_module mock}
+BuildRequires:  %{python_module nose}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module six}
-BuildRequires:  python-rpm-macros
-%if %{with test}
-BuildRequires:  %{python_module nose}
 BuildRequires:  memcached
-%endif
+BuildRequires:  python-rpm-macros
 Requires:       memcached
 Requires:       python-six
 BuildArch:      noarch
@@ -55,6 +52,9 @@ for more information.
 
 %prep
 %setup -q -n python-memcached-%{version}
+sed -i \
+    -e 's:#!/usr/bin/env python::' \
+    memcache.py
 
 %build
 %python_build
@@ -62,14 +62,13 @@ for more information.
 %install
 %python_install
 
-%if %{with test}
 %check
+/usr/sbin/memcached &
 %python_expand nosetests-%{$python_bin_suffix}
-%endif
 
 %files %{python_files}
-%defattr(-,root,root,-)
-%doc README.md PSF.LICENSE
+%license PSF.LICENSE
+%doc README.md
 %{python_sitelib}/*
 
 %changelog

From 52457b3eb994625240e30159943050ab133eaee06e3433e47e1b373b590032b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 8 Aug 2018 13:56:56 +0000
Subject: [PATCH 2/2] - Kill memcache deamon at the end of the tests

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-memcached?expand=0&rev=26
---
 python-python-memcached.changes | 5 +++++
 python-python-memcached.spec    | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/python-python-memcached.changes b/python-python-memcached.changes
index aa64982..0b9920a 100644
--- a/python-python-memcached.changes
+++ b/python-python-memcached.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Aug  8 13:56:44 UTC 2018 - tchvatal@suse.com
+
+- Kill memcache deamon at the end of the tests
+
 -------------------------------------------------------------------
 Wed Aug  8 13:28:02 UTC 2018 - tchvatal@suse.com
 
diff --git a/python-python-memcached.spec b/python-python-memcached.spec
index b4d3511..0f1ab2e 100644
--- a/python-python-memcached.spec
+++ b/python-python-memcached.spec
@@ -32,6 +32,7 @@ BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module six}
 BuildRequires:  memcached
 BuildRequires:  python-rpm-macros
+BuildRequires:  util-linux
 Requires:       memcached
 Requires:       python-six
 BuildArch:      noarch
@@ -63,8 +64,9 @@ sed -i \
 %python_install
 
 %check
-/usr/sbin/memcached &
+/usr/sbin/memcached -dv -P $PWD/memcached.pid
 %python_expand nosetests-%{$python_bin_suffix}
+kill -9 $(cat $PWD/memcached.pid)
 
 %files %{python_files}
 %license PSF.LICENSE