Accepting request 173495 from devel:languages:python

- Add python-memcached-ipv6-and-or.patch: Add IPv6 support and fix
  hostData port return value

- Update to version 1.48:
  + Dropped HTML docu

OBS-URL: https://build.opensuse.org/request/show/173495
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-python-memcached?expand=0&rev=5

python-memcached-1.47.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:59c5139d0a8d03e9bd796c984d0cd75b94ef955578372158152dacdfdfe32fc3
-size 37465

python-memcached-1.48.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b0bd09a717dd6d9ececb86cd28b041954f33d2022b388ddd113441feea3c19a6
+size 13025

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'^(?P<proto>unix):(?P<path>.*)$', host)
+         if not m:
++            m = re.match(r'^(?P<proto>inet6):'
++                    r'\[(?P<host>[^\[\]]+)\](:(?P<port>[0-9]+))?$', host)
++        if not m:
+             m = re.match(r'^(?P<proto>inet):'
+                     r'(?P<host>[^:]+)(:(?P<port>[0-9]+))?$', host)
+         if not m: m = re.match(r'^(?P<host>[^:]+)(:(?P<port>[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)
+ 

python-python-memcached.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+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
+
+- Update to version 1.48:
+  + Dropped HTML docu
+
 -------------------------------------------------------------------
 Fri Apr  1 11:23:28 UTC 2011 - oliver.bengs@opensuse.org
 

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
@@ -11,31 +11,30 @@
 # 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
+Version:        1.48
 Release:        0
 Url:            http://www.tummy.com/Community/software/python-memcached/
 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
-%if 0%{?suse_version}
+Provides:       python-memcached = %{version}
-%py_requires
+Obsoletes:      python-memcached < %{version}
-%if 0%{?suse_version} > 1110
+%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.
@@ -48,6 +47,7 @@ for more information.
 
 %prep
 %setup -q -n python-memcached-%{version}
+%patch0 -p1
 
 %build
 python setup.py build
@@ -57,7 +57,7 @@ python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog memcache.html README
+%doc README
 %{python_sitelib}/*
 
 %changelog