From 14224c8fcac37138f4e9a246b3835230478ef034 Mon Sep 17 00:00:00 2001
From: John Eckersberg <jeckersb@redhat.com>
Date: Fri, 19 Jun 2020 11:54:22 -0400
Subject: [PATCH] New upstream release 0.7.20 (rhbz#1848782)

---
 .gitignore          |  1 +
 python-netaddr.spec | 26 ++++++++++----------------
 sources             |  2 +-
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 848c6ca..292cbf4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ netaddr-0.7.4.tar.gz
 /netaddr-0.7.17.tar.gz
 /netaddr-0.7.18.tar.gz
 /netaddr-0.7.19.tar.gz
+/netaddr-0.7.20.tar.gz
diff --git a/python-netaddr.spec b/python-netaddr.spec
index c825745..63b3e30 100644
--- a/python-netaddr.spec
+++ b/python-netaddr.spec
@@ -7,8 +7,8 @@
 %endif
 
 Name:           python-netaddr
-Version:        0.7.19
-Release:        22%{?dist}
+Version:        0.7.20
+Release:        1%{?dist}
 Summary:        A pure Python network address representation and manipulation library
 
 License:        BSD
@@ -25,11 +25,6 @@ BuildRequires:  python2-devel
 BuildRequires:  python2-setuptools
 %endif
 
-Patch0: 0001-fixed-broken-tests-in-issue-149-python-3-regression-.patch
-Patch1: 0001-Do-not-override-executable-path.patch
-# From https://github.com/drkjam/netaddr/pull/167
-Patch2: 0001-PEP-479-return-instead-of-raise-StopIteration.patch
-
 %global desc A network address manipulation library for Python\
 \
 Provides support for:\
@@ -39,7 +34,8 @@ Layer 3 addresses\
  * IPv4 and IPv6 addresses, subnets, masks, prefixes\
  * iterating, slicing, sorting, summarizing and classifying IP networks\
  * dealing with various ranges formats (CIDR, arbitrary ranges and globs, nmap)\
- * set based operations (unions, intersections etc) over IP addresses and subnets\
+ * set based operations (unions, intersections etc) over IP addresses and\
+   subnets\
  * parsing a large variety of different formats and notations\
  * looking up IANA IP block information\
  * generating DNS reverse lookups\
@@ -80,19 +76,11 @@ BuildRequires:  python3-pytest
 
 %prep
 %setup -q -n netaddr-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
-# Make rpmlint happy, get rid of DOS line endings
-sed -i 's/\r//' netaddr/*.py netaddr/ip/*.py netaddr/eui/*.idx
 
 # Make rpmlint happy, rip out python shebang lines from most python
 # modules
 find netaddr -name "*.py" | \
   xargs sed -i -e '1 {/^#!\//d}'
-# Fix python executable
-sed -i -e '1s,/usr/bin/env python,%{__python2} %{?py_shbang_opts},' netaddr/tools/netaddr
 
 # Make rpmlint happy, fix permissions on documentation files
 chmod 0644 README.md AUTHORS CHANGELOG COPYRIGHT LICENSE PKG-INFO
@@ -109,8 +97,10 @@ chmod 0644 README.md AUTHORS CHANGELOG COPYRIGHT LICENSE PKG-INFO
 #docs
 pushd docs
 PYTHONPATH='../' sphinx-build-%{python3_version} -b html -d build/doctrees source html
+rm -f html/.buildinfo
 %if 0%{?with_python3}
 PYTHONPATH='../' sphinx-build-%{python3_version} -b html -d build/doctrees source python3/html
+rm -f python3/html/.buildinfo
 %endif
 popd
 
@@ -151,6 +141,10 @@ py.test-%{python3_version}
 %endif
 
 %changelog
+* Fri Jun 19 2020 John Eckersberg <jeckersb@redhat.com> - 0.7.20-1
+- New upstream release 0.7.20 (rhbz#1848782)
+- Minor spec and rpmlint cleanups
+
 * Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.7.19-22
 - Rebuilt for Python 3.9
 
diff --git a/sources b/sources
index 0fe6a17..005eccd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (netaddr-0.7.19.tar.gz) = 8440dee19d51828cd0dee403ec8c2fbc70e42d8c7c922d1a6a2a752100f9a313c521fa5e0789e024af0998f713599d50cf986e96867d3cc62a4143875e52d6bf
+SHA512 (netaddr-0.7.20.tar.gz) = f6cbfefa3cec95c039ef711b15e3c9509cdf730c9c4b9427fe2fa55beddd8fd44621fe8615d26a3b9ac6989a648f96d42a6a8e848a4976d883b8a5a243590ccf