From 53880ddb9c83632837f0889f85c94b13c67cc8e21bbc79eba7017570b68026c4 Mon Sep 17 00:00:00 2001 From: Antoine Belvire Date: Sun, 16 Jul 2017 20:48:48 +0000 Subject: [PATCH] - Rebase patch: * Remove python-zeroconf-0.17.4-enum34-instead-of-enum-compat.patch. * Add python-zeroconf-0.19.1-enum34-instead-of-enum-compat.patch. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-zeroconf?expand=0&rev=15 --- ...0.17.4-enum34-instead-of-enum-compat.patch | 22 ------------- ...0.19.1-enum34-instead-of-enum-compat.patch | 31 +++++++++++++++++++ python-zeroconf.changes | 4 +++ python-zeroconf.spec | 4 +-- 4 files changed, 37 insertions(+), 24 deletions(-) delete mode 100644 python-zeroconf-0.17.4-enum34-instead-of-enum-compat.patch create mode 100644 python-zeroconf-0.19.1-enum34-instead-of-enum-compat.patch diff --git a/python-zeroconf-0.17.4-enum34-instead-of-enum-compat.patch b/python-zeroconf-0.17.4-enum34-instead-of-enum-compat.patch deleted file mode 100644 index 88b3682..0000000 --- a/python-zeroconf-0.17.4-enum34-instead-of-enum-compat.patch +++ /dev/null @@ -1,22 +0,0 @@ -From eaa2a8ed38eaa8e15036974101f11cb95eec8db1 Mon Sep 17 00:00:00 2001 -From: Ruben Undheim -Date: Sun, 6 Mar 2016 10:26:23 +0100 -Subject: Set install_requires to enum34 instead of enum-compat - ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 54e05e1..653d963 100755 ---- a/setup.py -+++ b/setup.py -@@ -51,7 +51,7 @@ setup( - 'mDNS', - ], - install_requires=[ -- 'enum-compat', -+ 'enum34', - 'netifaces', - 'six', - ], diff --git a/python-zeroconf-0.19.1-enum34-instead-of-enum-compat.patch b/python-zeroconf-0.19.1-enum34-instead-of-enum-compat.patch new file mode 100644 index 0000000..6755c1f --- /dev/null +++ b/python-zeroconf-0.19.1-enum34-instead-of-enum-compat.patch @@ -0,0 +1,31 @@ +From 7021e671cb7b2113188419b36b0b823d0e2e8004 Mon Sep 17 00:00:00 2001 +From: Ruben Undheim +Date: Sun, 6 Mar 2016 10:26:23 +0100 +Subject: Set install_requires to enum34 instead of enum-compat + +--- + setup.py | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/setup.py b/setup.py +index ddda07c..a742454 100755 +--- a/setup.py ++++ b/setup.py +@@ -55,12 +55,8 @@ setup( + 'mDNS', + ], + install_requires=[ +- 'enum-compat', +- # netifaces 0.10.5 has a bug that results in all interfaces' netmasks +- # to be 255.255.255.255 on Windows which breaks things. See: +- # * https://github.com/jstasiak/python-zeroconf/issues/84 +- # * https://bitbucket.org/al45tair/netifaces/issues/39/netmask-is-always-255255255255 +- 'netifaces!=0.10.5', ++ 'enum34', ++ 'netifaces', + 'six', + ], + ) +-- +cgit v0.12 + diff --git a/python-zeroconf.changes b/python-zeroconf.changes index 99da3d5..bad98c0 100644 --- a/python-zeroconf.changes +++ b/python-zeroconf.changes @@ -6,6 +6,10 @@ Fri Jul 7 22:47:48 UTC 2017 - antoine.belvire@opensuse.org * On Windows, python-netifaces 0.10.5 triggers a bug - This has no impact for us, therefore there is no need for us to add a version requirement on this dependency as upstream did. +- Rebase patch: + * Remove + python-zeroconf-0.17.4-enum34-instead-of-enum-compat.patch. + * Add python-zeroconf-0.19.1-enum34-instead-of-enum-compat.patch. ------------------------------------------------------------------- Sat Mar 18 12:46:41 UTC 2017 - antoine.belvire@opensuse.org diff --git a/python-zeroconf.spec b/python-zeroconf.spec index 7dadd57..d254b1d 100644 --- a/python-zeroconf.spec +++ b/python-zeroconf.spec @@ -25,8 +25,8 @@ License: LGPL-2.0 Group: Development/Languages/Python Url: https://github.com/jstasiak/python-zeroconf Source: https://pypi.io/packages/source/z/zeroconf/zeroconf-%{version}.tar.gz -# PATCH-FIX-OPENSUSE python-zeroconf-0.17.4-enum34-instead-of-enum-compat.patch -- replace enum-compat by enum34 (picked from Debian) -Patch: python-zeroconf-0.17.4-enum34-instead-of-enum-compat.patch +# PATCH-FIX-OPENSUSE python-zeroconf-0.19.1-enum34-instead-of-enum-compat.patch -- replace enum-compat by enum34 (picked from Debian) +Patch: python-zeroconf-0.19.1-enum34-instead-of-enum-compat.patch BuildRequires: %{python_module setuptools} BuildRequires: python-rpm-macros %ifpython2