From acb23774a7882a303720a41f3189df02d6c6db232cf300bcaffe9f87ac36c2da Mon Sep 17 00:00:00 2001 From: Pascal Bleser Date: Mon, 12 Dec 2011 09:06:11 +0000 Subject: [PATCH 1/6] remove %debug_package OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-memcached?expand=0&rev=3 --- python-python-memcached.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/python-python-memcached.spec b/python-python-memcached.spec index 678347d..8ef6a3c 100644 --- a/python-python-memcached.spec +++ b/python-python-memcached.spec @@ -11,10 +11,12 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: python-python-memcached Version: 1.47 Release: 0 From 4ace319c180ee892fbb3363e1c199eb9ccc2540f2f30dc17292fc26c1c8e3db0 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 24 Jan 2012 14:31:31 +0000 Subject: [PATCH 2/6] Accepting request 101350 from Virtualization:Cloud:OpenStack:Diablo - fix Obsoletes OBS-URL: https://build.opensuse.org/request/show/101350 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-memcached?expand=0&rev=4 --- python-python-memcached.changes | 5 +++++ python-python-memcached.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/python-python-memcached.changes b/python-python-memcached.changes index 9ba4901..1e7aecc 100644 --- a/python-python-memcached.changes +++ b/python-python-memcached.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 24 13:44:53 UTC 2012 - bwiedemann@suse.com + +- fix Obsoletes + ------------------------------------------------------------------- Fri Apr 1 11:23:28 UTC 2011 - oliver.bengs@opensuse.org diff --git a/python-python-memcached.spec b/python-python-memcached.spec index 8ef6a3c..fe76c5a 100644 --- a/python-python-memcached.spec +++ b/python-python-memcached.spec @@ -1,7 +1,7 @@ # # spec file for package python-python-memcached # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,7 +36,7 @@ BuildArch: noarch %endif Provides: python-memcached = %{version} #TODO: Change back to '<' after next version update: -Obsoletes: python-memcached <= %{version} +Obsoletes: python-memcached < %{version} %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %description From 2d40a52324720d67524848678aeed13f193dec08d68786645f4362f49351b2c5 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 24 Jan 2012 14:36:23 +0000 Subject: [PATCH 3/6] remove unneeded todo OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-memcached?expand=0&rev=5 --- python-python-memcached.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-python-memcached.spec b/python-python-memcached.spec index fe76c5a..920a231 100644 --- a/python-python-memcached.spec +++ b/python-python-memcached.spec @@ -35,7 +35,6 @@ BuildArch: noarch %endif %endif Provides: python-memcached = %{version} -#TODO: Change back to '<' after next version update: Obsoletes: python-memcached < %{version} %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} From 7ec15d0efee8c7899d329c135b77822a72f3aaba767b193353f671b782d48200 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Tue, 26 Jun 2012 09:59:33 +0000 Subject: [PATCH 4/6] Accepting request 126142 from devel:languages:python OBS-URL: https://build.opensuse.org/request/show/126142 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-memcached?expand=0&rev=6 --- python-python-memcached.changes | 5 ----- python-python-memcached.spec | 5 +++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/python-python-memcached.changes b/python-python-memcached.changes index 1e7aecc..9ba4901 100644 --- a/python-python-memcached.changes +++ b/python-python-memcached.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Jan 24 13:44:53 UTC 2012 - bwiedemann@suse.com - -- fix Obsoletes - ------------------------------------------------------------------- Fri Apr 1 11:23:28 UTC 2011 - oliver.bengs@opensuse.org diff --git a/python-python-memcached.spec b/python-python-memcached.spec index 920a231..8ef6a3c 100644 --- a/python-python-memcached.spec +++ b/python-python-memcached.spec @@ -1,7 +1,7 @@ # # spec file for package python-python-memcached # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,7 +35,8 @@ BuildArch: noarch %endif %endif Provides: python-memcached = %{version} -Obsoletes: python-memcached < %{version} +#TODO: Change back to '<' after next version update: +Obsoletes: python-memcached <= %{version} %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %description From d807aa49b9e617ae88a7544233588cb8e0659e3b949c9716098a250c40292eea Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 26 Apr 2013 09:12:08 +0000 Subject: [PATCH 5/6] - Update to version 1.48: + Dropped HTML docu OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-memcached?expand=0&rev=7 --- python-memcached-1.47.tar.gz | 3 --- python-memcached-1.48.tar.gz | 3 +++ python-python-memcached.changes | 6 ++++++ python-python-memcached.spec | 20 ++++++++------------ 4 files changed, 17 insertions(+), 15 deletions(-) delete mode 100644 python-memcached-1.47.tar.gz create mode 100644 python-memcached-1.48.tar.gz diff --git a/python-memcached-1.47.tar.gz b/python-memcached-1.47.tar.gz deleted file mode 100644 index 09da454..0000000 --- a/python-memcached-1.47.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:59c5139d0a8d03e9bd796c984d0cd75b94ef955578372158152dacdfdfe32fc3 -size 37465 diff --git a/python-memcached-1.48.tar.gz b/python-memcached-1.48.tar.gz new file mode 100644 index 0000000..da71b3c --- /dev/null +++ b/python-memcached-1.48.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0bd09a717dd6d9ececb86cd28b041954f33d2022b388ddd113441feea3c19a6 +size 13025 diff --git a/python-python-memcached.changes b/python-python-memcached.changes index 9ba4901..f6aab4b 100644 --- a/python-python-memcached.changes +++ b/python-python-memcached.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 26 09:14:11 UTC 2013 - speilicke@suse.com + +- Update to version 1.48: + + Dropped HTML docu + ------------------------------------------------------------------- Fri Apr 1 11:23:28 UTC 2011 - oliver.bengs@opensuse.org diff --git a/python-python-memcached.spec b/python-python-memcached.spec index 8ef6a3c..b8397c9 100644 --- a/python-python-memcached.spec +++ b/python-python-memcached.spec @@ -1,7 +1,7 @@ # # spec file for package python-python-memcached # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +16,8 @@ # - Name: python-python-memcached -Version: 1.47 +Version: 1.48 Release: 0 Url: http://www.tummy.com/Community/software/python-memcached/ Summary: Pure python memcached client @@ -28,16 +27,13 @@ Source: http://pypi.python.org/packages/source/p/python-memcached/python BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-distribute -%if 0%{?suse_version} -%py_requires -%if 0%{?suse_version} > 1110 +Provides: python-memcached = %{version} +Obsoletes: python-memcached < %{version} +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%else BuildArch: noarch %endif -%endif -Provides: python-memcached = %{version} -#TODO: Change back to '<' after next version update: -Obsoletes: python-memcached <= %{version} -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %description This package was originally written by Evan Martin of Danga. @@ -59,7 +55,7 @@ python setup.py install --prefix=%{_prefix} --root=%{buildroot} %files %defattr(-,root,root,-) -%doc ChangeLog memcache.html README +%doc README %{python_sitelib}/* %changelog From 6b026afdf954350ef89726df55edbf864fda00ee815c802d9e695cc88088b3a3 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 26 Apr 2013 09:17:39 +0000 Subject: [PATCH 6/6] - Add python-memcached-ipv6-and-or.patch: Add IPv6 support and fix hostData port return value OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-memcached?expand=0&rev=8 --- python-memcached-ipv6-and-or.patch | 39 ++++++++++++++++++++++++++++++ python-python-memcached.changes | 6 +++++ python-python-memcached.spec | 2 ++ 3 files changed, 47 insertions(+) create mode 100644 python-memcached-ipv6-and-or.patch diff --git a/python-memcached-ipv6-and-or.patch b/python-memcached-ipv6-and-or.patch new file mode 100644 index 0000000..a6b079f --- /dev/null +++ b/python-memcached-ipv6-and-or.patch @@ -0,0 +1,39 @@ +diff -ruN a/memcache.py b/memcache.py +--- a/memcache.py 2011-11-28 02:17:32.000000000 +0100 ++++ b/memcache.py 2013-04-26 11:18:47.765452711 +0200 +@@ -1042,6 +1042,9 @@ + # parse the connection string + m = re.match(r'^(?Punix):(?P.*)$', host) + if not m: ++ m = re.match(r'^(?Pinet6):' ++ r'\[(?P[^\[\]]+)\](:(?P[0-9]+))?$', host) ++ if not m: + m = re.match(r'^(?Pinet):' + r'(?P[^:]+)(:(?P[0-9]+))?$', host) + if not m: m = re.match(r'^(?P[^:]+)(:(?P[0-9]+))?$', host) +@@ -1052,10 +1055,15 @@ + if hostData.get('proto') == 'unix': + self.family = socket.AF_UNIX + self.address = hostData['path'] ++ elif hostData.get('proto') == 'inet6': ++ self.family = socket.AF_INET6 ++ self.ip = hostData['host'] ++ self.port = int(hostData.get('port') or 11211) ++ self.address = ( self.ip, self.port ) + else: + self.family = socket.AF_INET + self.ip = hostData['host'] +- self.port = int(hostData.get('port', 11211)) ++ self.port = int(hostData.get('port') or 11211) + self.address = ( self.ip, self.port ) + + self.deaduntil = 0 +@@ -1158,6 +1166,8 @@ + + if self.family == socket.AF_INET: + return "inet:%s:%d%s" % (self.address[0], self.address[1], d) ++ elif self.family == socket.AF_INET6: ++ return "inet6:[%s]:%d%s" % (self.address[0], self.address[1], d) + else: + return "unix:%s%s" % (self.address, d) + diff --git a/python-python-memcached.changes b/python-python-memcached.changes index f6aab4b..4cb5d2f 100644 --- a/python-python-memcached.changes +++ b/python-python-memcached.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 26 09:20:00 UTC 2013 - speilicke@suse.com + +- Add python-memcached-ipv6-and-or.patch: Add IPv6 support and fix + hostData port return value + ------------------------------------------------------------------- Fri Apr 26 09:14:11 UTC 2013 - speilicke@suse.com diff --git a/python-python-memcached.spec b/python-python-memcached.spec index b8397c9..f6c0ee6 100644 --- a/python-python-memcached.spec +++ b/python-python-memcached.spec @@ -24,6 +24,7 @@ Summary: Pure python memcached client License: Python-2.0 Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/p/python-memcached/python-memcached-%{version}.tar.gz +Patch0: python-memcached-ipv6-and-or.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-distribute @@ -46,6 +47,7 @@ for more information. %prep %setup -q -n python-memcached-%{version} +%patch0 -p1 %build python setup.py build