diff --git a/ipaddr-2.1.11.tar.gz b/ipaddr-2.1.11.tar.gz deleted file mode 100644 index c54703f..0000000 --- a/ipaddr-2.1.11.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b555b8a8800134fdafe32b7d0cb52f5bdbfdd093707c3dd484c5ea59f1d98b7 -size 29046 diff --git a/ipaddr-2.2.0.tar.gz b/ipaddr-2.2.0.tar.gz new file mode 100644 index 0000000..f872a69 --- /dev/null +++ b/ipaddr-2.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4092dfe667588d16aa12b59acb7c8a4024e5dcb23a681cd0b0b602373eca88d6 +size 26266 diff --git a/python-ipaddr.changes b/python-ipaddr.changes index b16cf30..1e07e61 100644 --- a/python-ipaddr.changes +++ b/python-ipaddr.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Mar 25 12:35:53 UTC 2019 - pgajdos@suse.com + +- version update to 2.2.0 + * Fix compatibility with Python 3 + (despite ipaddress existence) + https://github.com/google/ipaddr-py/pull/118 +- deleted patches + - use_2to3.patch (not needed) + ------------------------------------------------------------------- Tue Dec 4 12:49:22 UTC 2018 - Matej Cepl diff --git a/python-ipaddr.spec b/python-ipaddr.spec index 2da060c..9a3b5c7 100644 --- a/python-ipaddr.spec +++ b/python-ipaddr.spec @@ -1,7 +1,7 @@ # # spec file for package python-ipaddr # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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,19 +18,16 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-ipaddr -Version: 2.1.11 +Version: 2.2.0 Release: 0 Summary: Google's IP address manipulation library License: Apache-2.0 Group: Development/Languages/Python URL: http://code.google.com/p/ipaddr-py/ Source: https://files.pythonhosted.org/packages/source/i/ipaddr/ipaddr-%{version}.tar.gz -# PATCH-FIX-OPENSUSE - use_2to3.patch - use 2to3 to build python3 packages -Patch0: use_2to3.patch BuildRequires: %{python_module pkginfo} BuildRequires: %{python_module setuptools} BuildRequires: python-rpm-macros -BuildRequires: python3-2to3 BuildArch: noarch %python_subpackages @@ -41,7 +38,6 @@ addresses and prefixes. %prep %setup -q -n ipaddr-%{version} -%patch0 -p1 sed -i "1d" ipaddr.py # Fix non-executable script %build @@ -51,22 +47,11 @@ sed -i "1d" ipaddr.py # Fix non-executable script %python_install %check -mkdir tester -pushd tester -%python_expand cp ../ipaddr_test.py ipaddr_test-%{$python_bin_suffix}.py - -if [ -e ipaddr_test-%{python3_bin_suffix}.py ] ; then - 2to3 -wn ipaddr_test-%{python3_bin_suffix}.py -fi - -%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib} -$python -B ipaddr_test-%{$python_bin_suffix}.py -} -popd +%{python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} $python ipaddr_test.py} %files %{python_files} %license COPYING -%doc README RELEASENOTES +%doc README %{python_sitelib}/* %changelog diff --git a/use_2to3.patch b/use_2to3.patch deleted file mode 100644 index 036e0d9..0000000 --- a/use_2to3.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/setup.py 2014-01-31 -+++ b/setup.py 2017-08-31 -@@ -14,17 +14,17 @@ - # See the License for the specific language governing permissions and - # limitations under the License. - --from distutils.core import setup -- --import ipaddr -+from setuptools import setup -+from pkginfo import UnpackedSDist - - - setup(name='ipaddr', - maintainer='Google', - maintainer_email='ipaddr-py-dev@googlegroups.com', -- version=ipaddr.__version__, - url='http://code.google.com/p/ipaddr-py/', - license='Apache License, Version 2.0', -+ version=UnpackedSDist('.').version, -+ use_2to3=True, - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers',