Browse code

Rename jsonpointer/jsonpatch for python3

Change-Id: Ic61242fbf089cc40f1613f5017f5ab5dc69a92da
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2545
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Xiaolin Li <xiaolinl@vmware.com>

sarchoi authored on 2017/04/28 04:06:50
Showing 2 changed files
... ...
@@ -3,7 +3,7 @@
3 3
 
4 4
 Name:           python-jsonpatch
5 5
 Version:        1.15
6
-Release:        2%{?dist}
6
+Release:        3%{?dist}
7 7
 Summary:        Applying JSON Patches in Python
8 8
 License:        Modified BSD License
9 9
 Group:          Development/Languages/Python
... ...
@@ -43,10 +43,12 @@ python3 setup.py build
43 43
 popd
44 44
 
45 45
 %install
46
-python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
47 46
 pushd ../p3dir
48 47
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
48
+mv %{buildroot}/%{_bindir}/jsonpatch %{buildroot}/%{_bindir}/jsonpatch3
49
+mv %{buildroot}/%{_bindir}/jsondiff %{buildroot}/%{_bindir}/jsondiff3
49 50
 popd
51
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
50 52
 
51 53
 %check
52 54
 python2 ext_tests.py && python2 tests.py
... ...
@@ -63,10 +65,12 @@ popd
63 63
 %files -n python3-jsonpatch
64 64
 %defattr(-,root,root)
65 65
 %{python3_sitelib}/*
66
-%{_bindir}/jsondiff
67
-%{_bindir}/jsonpatch
66
+%{_bindir}/jsondiff3
67
+%{_bindir}/jsonpatch3
68 68
 
69 69
 %changelog
70
+*       Thu Apr 27 2017 Sarah Choi <sarahc@vmware.com> 1.15-3
71
+-       Rename jsonpatch for python3
70 72
 *       Thu Apr 06 2017 Sarah Choi <sarahc@vmware.com> 1.15-2
71 73
 -       support python3
72 74
 *       Mon Apr 03 2017 Sarah Choi <sarahc@vmware.com> 1.15-1
... ...
@@ -3,7 +3,7 @@
3 3
 
4 4
 Name:           python-jsonpointer
5 5
 Version:        1.10
6
-Release:        4%{?dist}
6
+Release:        5%{?dist}
7 7
 Summary:        Applying JSON Patches in Python
8 8
 License:        Modified BSD License
9 9
 Group:          Development/Languages/Python
... ...
@@ -51,10 +51,11 @@ python3 tests.py
51 51
 popd
52 52
 
53 53
 %install
54
-python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
55 54
 pushd ../p3dir
56 55
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
56
+mv %{buildroot}/%{_bindir}/jsonpointer %{buildroot}/%{_bindir}/jsonpointer3
57 57
 popd
58
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
58 59
 
59 60
 %files
60 61
 %defattr(-,root,root,-)
... ...
@@ -64,9 +65,11 @@ popd
64 64
 %files -n python3-jsonpointer
65 65
 %defattr(-,root,root,-)
66 66
 %{python3_sitelib}/*
67
-%{_bindir}/jsonpointer
67
+%{_bindir}/jsonpointer3
68 68
 
69 69
 %changelog
70
+*       Wed Apr 26 2017 Sarah Choi <sarahc@vmware.com> 1.10-5
71
+-       Rename jsonpointer for python3 
70 72
 *       Thu Apr 06 2017 Sarah Choi <sarahc@vmware.com> 1.10-4
71 73
 -       support python3
72 74
 *       Tue Oct 04 2016 ChangLee <changlee@vmware.com> 1.10-3