New version

.gitignore

@@ -1,3 +1,4 @@
 /wcwidth-0.1.5.tar.gz
 /LICENSE
 /wcwidth-0.1.6.tar.gz
+/wcwidth-0.1.7.tar.gz

python-wcwidth.spec

@@ -1,48 +1,35 @@
-%if 0%{?rhel}
+%if 0%{?rhel} && 0%{?rhel} <= 7
-%global with_python3 0
+%bcond_with python3
-%{!?__python2: %global __python2 /usr/bin/python2}
-%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-%{!?py2_build: %global py2_build %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} build --executable="%{__python2} -s"}}
-%{!?py2_install: %global py2_install %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} install -O1 --skip-build --root %{buildroot}}}
 %else
-%global with_python3 1
+%bcond_without python3
 %endif
 
 # Disable tests since tox.ini is not found properly. I'll try to enable them back ASAP
-%global with_tests 0
+%bcond_with tests
 
 %global pypi_name wcwidth
 
 Name:           python-%{pypi_name}
-Version:        0.1.6
+Version:        0.1.7
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        Measures number of Terminal column cells of wide-character codes
 
 License:        MIT
 URL:            https://github.com/jquast/wcwidth
-Source0:        https://pypi.python.org/packages/source/w/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
+Source0:        https://pypi.io/packages/source/w/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 BuildArch:      noarch
  
-BuildRequires:  python2-devel
-BuildRequires:  python-setuptools
-%if 0%{?with_tests}
-BuildRequires:  python-tox
-%endif # with_tests
-%if 0%{?with_python3}
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-%if 0%{?with_tests}
-BuildRequires:  python3-tox 
-%endif # with_tests
-%endif # with_python3
-
 %description
 This API is mainly for Terminal Emulator implementors, or those writing programs
 that expect to interpreted by a terminal emulator and wish to determine the
 printable width of a string on a Terminal.
 
 %package -n     python2-%{pypi_name}
+BuildRequires:  python2-devel
+BuildRequires:  python-setuptools
+%if %{with tests}
+BuildRequires:  python-tox
+%endif # with tests
 Summary:        Measures number of Terminal column cells of wide-character codes
 %{?python_provide:%python_provide python2-%{pypi_name}}
 %{?el6:Provides: python-%{pypi_name}}
@@ -52,42 +39,44 @@ This API is mainly for Terminal Emulator implementors, or those writing programs
 that expect to interpreted by a terminal emulator and wish to determine the
 printable width of a string on a Terminal.
 
-%if 0%{?with_python3}
+%if %{with python3}
 %package -n     python3-%{pypi_name}
 Summary:        Measures number of Terminal column cells of wide-character codes
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+%if %{with tests}
+BuildRequires:  python3-tox 
+%endif # with tests
 %{?python_provide:%python_provide python3-%{pypi_name}}
 
 %description -n python3-%{pypi_name}
 This API is mainly for Terminal Emulator implementors, or those writing programs
 that expect to interpreted by a terminal emulator and wish to determine the
 printable width of a string on a Terminal.
-%endif # with_python3
+%endif # with python3
 
 %prep
 %setup -q -n %{pypi_name}-%{version}
-rm -rf %{pypi_name}.egg-info
-# As for https://github.com/jquast/wcwidth/pull/16
-sed -i -e '1 d' wcwidth/tests/test_core.py
 
 %build
 %py2_build
-%if 0%{?with_python3}
+%if %{with python3}
 %py3_build
-%endif # with_python3
+%endif # with python3
 
 %install
-%if 0%{?with_python3}
-%py3_install
-%endif # with_python3
 %py2_install
+%if %{with python3}
+%py3_install
+%endif # with python3
 
-%if 0%{?with_tests}
+%if %{with tests}
 %check
 %{__python2} setup.py test
-%if 0%{?with_python3}
+%if %{with python3}
 %{__python3} setup.py test
-%endif # with_python3
+%endif # with python3
-%endif # with_tests
+%endif # with tests
 
 %files -n python2-%{pypi_name} 
 %{!?_licensedir:%global license %doc}
@@ -96,30 +85,33 @@ sed -i -e '1 d' wcwidth/tests/test_core.py
 %{python2_sitelib}/%{pypi_name}
 %{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
 
-%if 0%{?with_python3}
+%if %{with python3}
 %files -n python3-%{pypi_name} 
 %doc README.rst
 %license LICENSE.txt
 %{python3_sitelib}/%{pypi_name}
 %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
-%endif # with_python3
+%endif # with python3
 
 %changelog
+* Tue Dec 13 2016 Fabio Alessandro Locati <fale@fedoraproject.org> - 0.1.7-1
+- Update to 0.1.7
+
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.6-4
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
 
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
-* Tue Jan 12 2016 Fabio Alessandro Locati <fabio@locati.cc> - 0.1.6-2
+* Tue Jan 12 2016 Fabio Alessandro Locati <fale@fedoraproject.org> - 0.1.6-2
 - Provide python-wcwidth for EL6
 
-* Sat Jan 09 2016 Fabio Alessandro Locati <fabio@locati.cc> - 0.1.6-1
+* Sat Jan 09 2016 Fabio Alessandro Locati <fale@fedoraproject.org> - 0.1.6-1
 - Update to new upstream
 - Remove external LICENSE thanks to the new version
 
-* Wed Jan 06 2016 Fabio Alessandro Locati <fabio@locati.cc> - 0.1.5-2
+* Wed Jan 06 2016 Fabio Alessandro Locati <fale@fedoraproject.org> - 0.1.5-2
 - Remove shabang from file that was not executable
 
-* Tue Dec 29 2015 Fabio Alessandro Locati <fabio@locati.cc> - 0.1.5-1
+* Tue Dec 29 2015 Fabio Alessandro Locati <fale@fedoraproject.org> - 0.1.5-1
 - Initial package.

sources

@@ -1 +1 @@
-53031c6d6490d65c1de601595cff835f  wcwidth-0.1.6.tar.gz
+SHA512 (wcwidth-0.1.7.tar.gz) = 5bc9625fbd10721a50a3ac7d7f91012cca8e4f83533f265cf56890498bc52a53b155c82e67d6bc5523a5593c8d7992a1dec2a0f590318170eddf987c56f9c368