Update.

diff --git a/pOCCI-2to3.diff b/pOCCI-2to3.diff
index 1d421e4..030f8f5 100644 (file)
--- a/pOCCI-2to3.diff
+++ b/pOCCI-2to3.diff
@@ -1,4 +1,4 @@
-Enable 2to3 conversion in setuptools with workaround for tests.
+Convert the tests together with the sources.
 
 diff --git a/setup.py b/setup.py
 index 76d7dc8..7ec9658 100644
@@ -13,10 +13,3 @@ index 76d7dc8..7ec9658 100644
  
      install_requires=['pycurl'],
  
-@@ -68,4 +68,6 @@ setup(
-     },
- 
-     test_suite='tests',
-+
-+    use_2to3 = True,
- )

diff --git a/python-pOCCI.spec b/python-pOCCI.spec
index 5ff6d67..389459f 100644 (file)
--- a/python-pOCCI.spec
+++ b/python-pOCCI.spec
@@ -1,5 +1,5 @@
 %global srcname pOCCI
-%global commit d61185f1ed58d8bfb8606be256936483d110b78a
+%global commit d2a380ed1506ee483cda3b576227f649b0da109b
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 %{!?py2_build:%global py2_build %{__python2} setup.py build --executable="%{__python2} -s"}
@@ -70,8 +70,6 @@ User and API documentation for OCCI compliance testing python modules.
 %setup -qc
 pushd %{srcname}-%{commit}
 %patch1 -p1
-# can be removed upstream
-sed -e "/'numpydoc'/d" -i doc/conf.py
 %if 0%{?rhel} && 0%{?rhel} <= 6
 sed -e "/'sphinx.ext.viewcode'/d" -i doc/conf.py
 %endif
@@ -98,7 +96,7 @@ popd
 pushd python2
 %py2_install
 popd
-cp -p %{buildroot}%{_bindir}/pOCCI %{buildroot}%{_bindir}/pOCCI-2.7
+cp -p %{buildroot}%{_bindir}/pOCCI %{buildroot}%{_bindir}/pOCCI-%{python2_version}
 rm -f %{buildroot}%{python2_sitelib}/%{srcname}/pOCCI.cfg
 rm -rf %{buildroot}%{python2_sitelib}/tests
 chmod +x %{buildroot}%{python2_sitelib}/%{srcname}/pOCCI.py
@@ -106,7 +104,7 @@ chmod +x %{buildroot}%{python2_sitelib}/%{srcname}/pOCCI.py
 %if 0%{?with_python3}
 pushd python3
 %py3_install
-cp -p %{buildroot}%{_bindir}/pOCCI %{buildroot}%{_bindir}/pOCCI-3.4
+cp -p %{buildroot}%{_bindir}/pOCCI %{buildroot}%{_bindir}/pOCCI-%{python3_version}
 rm -f %{buildroot}%{python3_sitelib}/%{srcname}/pOCCI.cfg
 rm -rf %{buildroot}%{python3_sitelib}/tests
 chmod +x %{buildroot}%{python3_sitelib}/%{srcname}/pOCCI.py
@@ -163,5 +161,5 @@ popd
 
 
 %changelog
-* Tue Aug 25 2015 František Dvořák <valtri@civ.zcu.cz> - 0.0.1-0.20150826git72fa242
+* Wed Aug 26 2015 František Dvořák <valtri@civ.zcu.cz> - 0.0.1-0.20150826gitd2a380e
 - Initial package