fix shebang; use python3 in bin by default; rel 3

[packages/python-netaddr.git] / python-netaddr.spec

diff --git a/python-netaddr.spec b/python-netaddr.spec
index 593e984307f26538b614e3594ad405c841642bff..f4c6d0265ae6cba08cd32120f23c5197361e2355 100644 (file)
--- a/python-netaddr.spec
+++ b/python-netaddr.spec
@@ -6,12 +6,13 @@
 %define                module  netaddr
 Summary:       A pure Python network address representation and manipulation library
 Name:          python-netaddr
-Version:       0.7.14
-Release:       6
+Version:       0.7.19
+Release:       3
 License:       BSD
 Group:         Development/Languages/Python
 Source0:       https://pypi.python.org/packages/source/n/netaddr/%{module}-%{version}.tar.gz
-# Source0-md5: 1ba9d1e887c838f190774cf6b74c109d
+# Source0-md5: 51019ef59c93f3979bcb37d3b8527e07
+Patch0:                script-shebang.patch
 URL:           https://github.com/drkjam/netaddr/
 BuildRequires: rpmbuild(macros) >= 1.710
 BuildRequires: python-modules
@@ -68,13 +69,21 @@ Included are routines for:
 %package -n netaddr
 Summary:       An interactive shell for the Python netaddr library
 Group:         Development/Languages/Python
+%if %{with python3}
+Requires:      python3-netaddr = %{version}-%{release}
+%else
 Requires:      %{name} = %{version}-%{release}
+%endif
 
 %description -n netaddr
 Interactive shell for the python-netaddr library.
 
 %prep
 %setup -q -n %{module}-%{version}
+%patch0 -p1
+
+%{__sed} -i -e '1s,/usr/bin/env python,%{?with_python3:%{__python3}}%{!?with_python3:%{__python}},' \
+       netaddr/tools/netaddr
 
 %build
 %py_build
@@ -110,13 +119,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS CHANGELOG README THANKS
+%doc AUTHORS CHANGELOG README.md
 %if %{with apidocs}
 %doc build/html
 %endif
 %{py_sitescriptdir}/*.egg-info
 %dir %{py_sitescriptdir}/%{module}
 %{py_sitescriptdir}/%{module}/*.py[co]
+%dir %{py_sitescriptdir}/%{module}/contrib
+%{py_sitescriptdir}/%{module}/contrib/*.py[co]
 %dir %{py_sitescriptdir}/%{module}/eui
 %{py_sitescriptdir}/%{module}/eui/*.py[co]
 %{py_sitescriptdir}/%{module}/eui/*.idx
@@ -126,8 +137,8 @@ rm -rf $RPM_BUILD_ROOT
 %{py_sitescriptdir}/%{module}/ip/*.xml
 %dir %{py_sitescriptdir}/%{module}/strategy
 %{py_sitescriptdir}/%{module}/strategy/*.py[co]
-%dir %{py_sitescriptdir}/%{module}/tests
-%{py_sitescriptdir}/%{module}/tests/*.py[co]
+#%dir %{py_sitescriptdir}/%{module}/tests
+#%{py_sitescriptdir}/%{module}/tests/*.py[co]
 #%{py_sitescriptdir}/%{module}/tests/2.x/core
 #%{py_sitescriptdir}/%{module}/tests/2.x/eui
 #%{py_sitescriptdir}/%{module}/tests/2.x/ip
@@ -136,7 +147,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with python3}
 %files -n python3-netaddr
 %defattr(644,root,root,755)
-%doc AUTHORS CHANGELOG README THANKS
+%doc AUTHORS CHANGELOG README.md
 %if %{with apidocs}
 %doc build/html
 %endif
@@ -144,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{py3_sitescriptdir}/%{module}
 %{py3_sitescriptdir}/%{module}/*.py
 %{py3_sitescriptdir}/%{module}/__pycache__
+%dir %{py3_sitescriptdir}/%{module}/contrib
+%{py3_sitescriptdir}/%{module}/contrib/*.py
+%{py3_sitescriptdir}/%{module}/contrib/__pycache__
 %dir %{py3_sitescriptdir}/%{module}/eui
 %{py3_sitescriptdir}/%{module}/eui/*.py
 %{py3_sitescriptdir}/%{module}/eui/__pycache__
@@ -156,9 +170,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{py3_sitescriptdir}/%{module}/strategy
 %{py3_sitescriptdir}/%{module}/strategy/*.py
 %{py3_sitescriptdir}/%{module}/strategy/__pycache__
-%dir %{py3_sitescriptdir}/%{module}/tests
-%{py3_sitescriptdir}/%{module}/tests/*.py
-%{py3_sitescriptdir}/%{module}/tests/__pycache__
+#%dir %{py3_sitescriptdir}/%{module}/tests
+#%{py3_sitescriptdir}/%{module}/tests/*.py
+#%{py3_sitescriptdir}/%{module}/tests/__pycache__
 #%{py3_sitescriptdir}/%{module}/tests/3.x/core
 #%{py3_sitescriptdir}/%{module}/tests/3.x/eui
 #%{py3_sitescriptdir}/%{module}/tests/3.x/ip