diff --git a/python-netaddr.spec b/python-netaddr.spec index 0325d19..c8569ed 100644 --- a/python-netaddr.spec +++ b/python-netaddr.spec @@ -4,7 +4,7 @@ Name: python-netaddr Version: 0.7.18 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A pure Python network address representation and manipulation library License: BSD @@ -100,18 +100,11 @@ find netaddr -name "*.py" | \ # Make rpmlint happy, fix permissions on documentation files chmod 0644 README.md AUTHORS CHANGELOG COPYRIGHT INSTALL LICENSE PKG-INFO -%if 0%{?with_python3} -rm -rf %{py3dir} -cp -a . %{py3dir} -%endif - %build -%{__python2} setup.py build +%py2_build %if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py build -popd +%py3_build %endif #docs @@ -125,13 +118,11 @@ popd %install %if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py install -O1 --skip-build --root %{buildroot} +%py3_install mv %{buildroot}%{_bindir}/netaddr %{buildroot}%{_bindir}/netaddr3 -popd %endif -%{__python2} setup.py install -O1 --skip-build --root %{buildroot} +%py2_install %check @@ -141,20 +132,26 @@ LANG=en_US.UTF-8 py.test-%{python3_version} %endif %files -%doc AUTHORS CHANGELOG COPYRIGHT INSTALL LICENSE PKG-INFO +%license COPYRIGHT +%doc AUTHORS CHANGELOG INSTALL LICENSE PKG-INFO %doc README.md docs/html -%{python_sitelib}/* +%{python2_sitelib}/* %{_bindir}/netaddr %if 0%{?with_python3} %files -n python3-netaddr -%doc AUTHORS CHANGELOG COPYRIGHT INSTALL LICENSE PKG-INFO +%license COPYRIGHT +%doc AUTHORS CHANGELOG INSTALL LICENSE PKG-INFO %doc README.md docs/python3/html %{python3_sitelib}/* %{_bindir}/netaddr3 %endif %changelog +* Thu Nov 10 2016 Orion Poplawski - 0.7.18-8 +- Use updated python macros +- Use %%license + * Tue Jul 19 2016 Fedora Release Engineering - 0.7.18-7 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages