14
0

- 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
This commit is contained in:
Antoine Belvire
2017-07-16 20:48:48 +00:00
committed by Git OBS Bridge
parent ce5240661f
commit 53880ddb9c
4 changed files with 37 additions and 24 deletions

View File

@@ -1,22 +0,0 @@
From eaa2a8ed38eaa8e15036974101f11cb95eec8db1 Mon Sep 17 00:00:00 2001
From: Ruben Undheim <ruben.undheim@gmail.com>
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',
],

View File

@@ -0,0 +1,31 @@
From 7021e671cb7b2113188419b36b0b823d0e2e8004 Mon Sep 17 00:00:00 2001
From: Ruben Undheim <ruben.undheim@gmail.com>
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

View File

@@ -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

View File

@@ -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