Browse code
Updated python-m2r version to 0.1.7 And fixed make check errors
Change-Id: I939157180f856b52d9ced460afa2752b1831dc2c
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3303
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
dthaluru authored on 2017/07/22 03:12:53Showing 1 changed files
| ... | ... |
@@ -3,23 +3,30 @@ |
| 3 | 3 |
|
| 4 | 4 |
Summary: Markdown to reStructuredText converter. |
| 5 | 5 |
Name: python-m2r |
| 6 |
-Version: 0.1.5 |
|
| 7 |
-Release: 3%{?dist}
|
|
| 6 |
+Version: 0.1.7 |
|
| 7 |
+Release: 1%{?dist}
|
|
| 8 | 8 |
License: MIT |
| 9 | 9 |
Group: Development/Languages/Python |
| 10 | 10 |
Vendor: VMware, Inc. |
| 11 | 11 |
Distribution: Photon |
| 12 | 12 |
Url: https://pypi.python.org/pypi/m2r |
| 13 |
-Source0: https://files.pythonhosted.org/packages/source/m/m2r/m2r-%{version}.tar.gz
|
|
| 14 |
-%define sha1 m2r=9c5aa6fa791ff53c5007774159d4d0d2ffb4e36a |
|
| 13 |
+Source0: https://github.com/miyakogi/m2r/archive/v%{version}/m2r-%{version}.tar.gz
|
|
| 14 |
+%define sha1 m2r=0b4ce1ba98d380e641657a673675568cc692f0c8 |
|
| 15 | 15 |
|
| 16 | 16 |
BuildRequires: python2 |
| 17 | 17 |
BuildRequires: python2-libs |
| 18 | 18 |
BuildRequires: python2-devel |
| 19 | 19 |
BuildRequires: python-setuptools |
| 20 |
+BuildRequires: python-mistune |
|
| 21 |
+BuildRequires: python-docutils |
|
| 22 |
+%if %{with_check}
|
|
| 23 |
+BuildRequires: python-Pygments |
|
| 24 |
+%endif |
|
| 20 | 25 |
|
| 21 | 26 |
Requires: python2 |
| 22 | 27 |
Requires: python2-libs |
| 28 |
+Requires: python-mistune |
|
| 29 |
+Requires: python-docutils |
|
| 23 | 30 |
|
| 24 | 31 |
BuildArch: noarch |
| 25 | 32 |
|
| ... | ... |
@@ -36,9 +43,16 @@ BuildRequires: python3-devel |
| 36 | 36 |
BuildRequires: python3-libs |
| 37 | 37 |
BuildRequires: python3-setuptools |
| 38 | 38 |
BuildRequires: python3-xml |
| 39 |
+BuildRequires: python3-mistune |
|
| 40 |
+BuildRequires: python3-docutils |
|
| 41 |
+%if %{with_check}
|
|
| 42 |
+BuildRequires: python3-Pygments |
|
| 43 |
+%endif |
|
| 39 | 44 |
|
| 40 | 45 |
Requires: python3 |
| 41 | 46 |
Requires: python3-libs |
| 47 |
+Requires: python3-mistune |
|
| 48 |
+Requires: python3-docutils |
|
| 42 | 49 |
|
| 43 | 50 |
%description -n python3-m2r |
| 44 | 51 |
Python 3 version. |
| ... | ... |
@@ -62,9 +76,13 @@ popd |
| 62 | 62 |
python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
|
| 63 | 63 |
|
| 64 | 64 |
%check |
| 65 |
-python2 setup.py test |
|
| 65 |
+easy_install_2=$(ls /usr/bin |grep easy_install |grep 2) |
|
| 66 |
+$easy_install_2 mock |
|
| 67 |
+python2 setup.py test -s tests |
|
| 66 | 68 |
pushd ../p3dir |
| 67 |
-python3 setup.py test |
|
| 69 |
+easy_install_3=$(ls /usr/bin |grep easy_install |grep 3) |
|
| 70 |
+$easy_install_3 mock |
|
| 71 |
+python3 setup.py test -s tests |
|
| 68 | 72 |
popd |
| 69 | 73 |
|
| 70 | 74 |
%files |
| ... | ... |
@@ -78,6 +96,9 @@ popd |
| 78 | 78 |
%{_bindir}/m2r3
|
| 79 | 79 |
|
| 80 | 80 |
%changelog |
| 81 |
+* Fri Jul 21 2017 Divya Thaluru <dthaluru@vmware.com> 0.1.7-1 |
|
| 82 |
+- Updated version to 0.1.7 |
|
| 83 |
+- Fixed make check errors |
|
| 81 | 84 |
* Mon Jun 19 2017 Xiaolin Li <xiaolinl@vmware.com> 0.1.5-3 |
| 82 | 85 |
- Add python3-setuptools and python3-xml to python3 sub package Buildrequires. |
| 83 | 86 |
* Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.1.5-2 |