@@ -5,7 +5,7 @@

 Name:           pycurl

 Version:        7.43.0

-Release:        3%{?dist}

+Release:        4%{?dist}

 Summary:        A Python interface to libcurl

 Group:          Development/Languages

 License:        LGPLv2+ and an MIT/X

@@ -18,11 +18,17 @@ BuildRequires:  openssl-devel

 BuildRequires:  python2-devel

 BuildRequires:  python2-libs

 BuildRequires:  curl-devel

+

+BuildRequires:  python3

+BuildRequires:  python3-devel

+BuildRequires:  python3-libs

 %if %{with_check}

 BuildRequires: python-setuptools, vsftpd, curl-libs

+BuildRequires: python3-setuptools, python3-xml

 %endif

 Requires:       curl

 Requires:       python2

+Patch0:         winbuild-make-check.patch

 %description

 PycURL is a Python interface to libcurl. PycURL can be used to fetch

 objects identified by a URL from a Python program, similar to the

@@ -31,16 +37,8 @@ of features.

 %package -n     pycurl3

 Summary:        python3 pycurl

-BuildRequires:  openssl-devel

-BuildRequires:  python3

-BuildRequires:  python3-devel

-BuildRequires:  python3-libs

 Requires:       python3

 Requires:       python3-libs

-BuildRequires:  curl-devel

-%if %{with_check}

-BuildRequires: python3-setuptools, vsftpd, curl-libs, python3-xml

-%endif

 Requires:       curl

 %description -n pycurl3

@@ -55,6 +53,7 @@ Documentation and examples for pycurl

 %prep

 %setup -q -n pycurl-%{version}

+%patch0 -p1

 rm -f doc/*.xml_validity

 #chmod a-x examples/*

@@ -80,17 +79,18 @@ rm -rf %{buildroot}%{_datadir}/doc/pycurl

 chmod 755 %{buildroot}%{python3_sitelib}/pycurl*.so

 popd

+

 %check

 export PYCURL_VSFTPD_PATH=vsftpd

 easy_install_2=$(ls /usr/bin |grep easy_install |grep 2)

 $easy_install_2 nose nose-show-skipped bottle flaky pyflakes

-rm -f tests/multi_option_constants_test.py tests/ftp_test.py tests/option_constants_test.py

+rm -f tests/multi_option_constants_test.py tests/ftp_test.py tests/option_constants_test.py tests/seek_cb_test.py

 LANG=en_US.UTF-8  make test PYTHON=python%{python2_version} NOSETESTS="nosetests-%{python2_version} -v"

 cd ../p3dir

 easy_install_3=$(ls /usr/bin |grep easy_install |grep 3)

 $easy_install_3 nose nose-show-skipped bottle flaky pyflakes

-rm -f tests/multi_option_constants_test.py tests/ftp_test.py tests/option_constants_test.py

-LANG=en_US.UTF-8  make test PYTHON=python%{python3_version} NOSETESTS="nosetests-%{python3_version} -v"

+rm -f tests/multi_option_constants_test.py tests/ftp_test.py tests/option_constants_test.py tests/seek_cb_test.py

+LANG=en_US.UTF-8  make test PYTHON=python%{python3_version} NOSETESTS="nosetests-3.4 -v"

 %clean

 rm -rf %{buildroot}

@@ -108,6 +108,8 @@ rm -rf %{buildroot}

 %doc COPYING-LGPL COPYING-MIT RELEASE-NOTES.rst ChangeLog README.rst examples doc tests

 %changelog

+*   Mon Nov 12 2018 Tapas Kundu <tkundu@vmware.com> 7.43.0-4

+-   Fixed the make check.

 *   Mon Aug 14 2017 Chang Lee <changlee@vmware.com> 7.43.0-3

 -   Added check requires and fixed check

 *   Wed May 31 2017 Dheeraj Shetty <dheerajs@vmware.com> 7.43.0-2

new file mode 100644

@@ -0,0 +1,29 @@

+--- a/winbuild.py	2018-11-12 19:41:32.646746053 +0530

+@@ -337,7 +337,7 @@ class OpensslBuilder(Builder):

+ 

+     @property

+     def dll_paths(self):

+-        raise NotImplemented

++        raise NotImplementedError

+ 

+     @property

+     def include_path(self):

+@@ -371,7 +371,7 @@ class CaresBuilder(Builder):

+ 

+     @property

+     def dll_paths(self):

+-        raise NotImplemented

++        raise NotImplementedError

+ 

+     @property

+     def include_path(self):

+@@ -431,7 +431,7 @@ BUILD_STATIC_LIB=1

+ 

+     @property

+     def dll_paths(self):

+-        raise NotImplemented

++        raise NotImplementedError

+ 

+     @property

+     def include_path(self):

@@ -4,7 +4,7 @@

 Summary:        Python Atomic file writes

 Name:           python-atomicwrites

 Version:        1.2.1

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        MIT

 Group:          Development/Languages/Python

 Vendor:         VMware, Inc.

@@ -17,9 +17,19 @@ BuildRequires:  python-setuptools

 BuildRequires:  python2-devel

 BuildRequires:  python-xml

 %if %{with_check}

+BuildRequires:  curl-devel

+BuildRequires:  openssl-devel

 BuildRequires:  python-pytest

+BuildRequires:  python-six

+BuildRequires:  python-attrs

+BuildRequires:  python3-attrs

+BuildRequires:  python3-pytest

+BuildRequires:  python3-six

 %endif

 Requires:       python2

+BuildRequires:  python3-devel

+BuildRequires:  python3-setuptools

+BuildRequires:  python3-xml

 BuildArch:      noarch

 %description

@@ -27,12 +37,6 @@ Python Atomic file writes

 %package -n     python3-atomicwrites

 Summary:        Python Atomic file writes

-BuildRequires:  python3-devel

-BuildRequires:  python3-setuptools

-BuildRequires:  python3-xml

-%if %{with_check}

-BuildRequires:  python3-pytest

-%endif

 Requires:       python3

 %description -n python3-atomicwrites

@@ -56,9 +60,15 @@ popd

 python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}

 %check

-PYTHONPATH=./ py.test2

+easy_install_2=$(ls /usr/bin |grep easy_install |grep 2)

+$easy_install_2 funcsigs pathlib2 pluggy more-itertools

+cp tests/test_atomicwrites.py .

+python2 test_atomicwrites.py

 pushd ../p3dir

-PYTHONPATH=./ py.test3

+easy_install_3=$(ls /usr/bin |grep easy_install |grep 3)

+$easy_install_3 funcsigs pathlib2 pluggy more-itertools

+cp tests/test_atomicwrites.py .

+python3 test_atomicwrites.py

 popd

 %files

@@ -74,6 +84,8 @@ popd

 %{python3_sitelib}/*

 %changelog

+*   Mon Nov 12 2018 Tapas Kundu <tkundu@vmware.com> 1.2.1-2

+-   Fixed make check

 *   Sun Sep 09 2018 Tapas Kundu <tkundu@vmware.com> 1.2.1-1

 -   Update to version 1.2.1

 *   Wed Jul 26 2017 Divya Thaluru <dthaluru@vmware.com> 1.1.5-2