1. photon
  2. Commit 2d879f6bb4cdf512fd2a73169edd425fe2eceaae
Browse code

Build using python2, python2 explicity,Rename scripts in /usr/bin

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

DheerajSShetty authored on 2017/06/17 06:05:59
Showing 44 changed files
SPECS/PyPAM/PyPAM.spec
History View file @ 2d879f6
... ... 
@@ -5,7 +5,7 @@
5 5 
 Summary:        Python bindings for PAM (Pluggable Authentication Modules).
6 6 
 Name:           PyPAM
7 7 
 Version:        0.5.0
8 
-Release:        1%{?dist}
8 
+Release:        2%{?dist}
9 9 
 License:        LGPLv2
10 10 
 Group:          Development/Languages/Python
11 11 
 Vendor:         VMware, Inc.
... ... 
@@ -74,12 +74,14 @@ popd
74 74
75 75 
 %files
76 76 
 %defattr(-,root,root,-)
77 
-%{python_sitelib}/*
77 
+%{python2_sitelib}/*
78 78
79 79 
 %files -n python3-PyPAM
80 80 
 %defattr(-,root,root,-)
81 81 
 %{python3_sitelib}/*
82 82
83 83 
 %changelog
84 
+*   Wed May 31 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.5.0-2
85 
+-   Changing python_sitelib to python2
84 86 
 *   Tue Apr 11 2017 Xiaolin Li <xiaolinl@vmware.com> 0.5.0-1
85 87 
 -   Initial packaging for Photon.
SPECS/pycrypto/pycrypto.spec
History View file @ 2d879f6
... ... 
@@ -1,10 +1,10 @@
1 
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1 
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 2 
 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3 3
4 4 
 Summary:        The Python Cryptography Toolkit.
5 5 
 Name:           pycrypto
6 6 
 Version:        2.7a1
7 
-Release:        3%{?dist}
7 
+Release:        5%{?dist}
8 8 
 License:        UNKNOWN
9 9 
 URL:            https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.7a1.tar.gz
10 10 
 Source:         %{name}-%{version}.tar.gz
... ... 
@@ -22,6 +22,7 @@ This is a collection of both secure hash functions (such as SHA256 and RIPEMD160
22 22 
 %package -n     python3-pycrypto
23 23 
 Summary:        python3-pycrypto
24 24 
 BuildRequires:  python3-devel
25 
+BuildRequires:  python3-libs
25 26
26 27 
 Requires:       python3
27 28 
 %description -n python3-pycrypto
... ... 
@@ -32,26 +33,28 @@ Python 3 version.
32 32 
 %setup -q
33 33
34 34 
 %build
35 
-python setup.py build
35 
+python2 setup.py build
36 36 
 python3 setup.py build
37 37
38 38 
 %install
39 
-python setup.py install -O1 --root=%{buildroot} --prefix=/usr
39 
+python2 setup.py install -O1 --root=%{buildroot} --prefix=/usr
40 40 
 python3 setup.py install -O1 --root=%{buildroot} --prefix=/usr
41 41
42 42 
 %check
43 
-python setup.py test
43 
+python2 setup.py test
44 44 
 python3 setup.py test
45 45
46 46 
 %files
47 47 
 %defattr(-,root,root)
48 
-%{python_sitelib}/*
48 
+%{python2_sitelib}/*
49 49
50 50 
 %files -n python3-pycrypto
51 51 
 %defattr(-, root, root)
52 52 
 %{python3_sitelib}/*
53 53
54 54 
 %changelog
55 
+*   Wed May 31 2017 Dheeraj Shetty <dheerajs@vmware.com> 2.7a1-5
56 
+-   Using python2 explicitly while building
55 57 
 *   Mon Feb 27 2017 Xiaolin Li <xiaolinl@vmware.com> 2.7a1-4
56 58 
 -   Added python3 site-packages.
57 59 
 *   Mon Oct 03 2016 ChangLee <changLee@vmware.com> 2.7a1-3
SPECS/pycurl/pycurl.spec
History View file @ 2d879f6
... ... 
@@ -3,7 +3,7 @@
3 3
4 4 
 Name:           pycurl
5 5 
 Version:        7.43.0
6 
-Release:        1%{?dist}
6 
+Release:        2%{?dist}
7 7 
 Summary:        A Python interface to libcurl
8 8 
 Group:          Development/Languages
9 9 
 License:        LGPLv2+ and an MIT/X
... ... 
@@ -56,14 +56,14 @@ rm -rf ../p3dir
56 56 
 cp -a . ../p3dir
57 57
58 58 
 %build
59 
-CFLAGS="$RPM_OPT_FLAGS -DHAVE_CURL_OPENSSL" python setup.py build
59 
+CFLAGS="$RPM_OPT_FLAGS -DHAVE_CURL_OPENSSL" python2 setup.py build
60 60 
 pushd ../p3dir
61 61 
 CFLAGS="$RPM_OPT_FLAGS -DHAVE_CURL_OPENSSL" python3 setup.py build
62 62 
 popd
63 63
64 64 
 %install
65 65 
 rm -rf %{buildroot}
66 
-python setup.py install -O1 --skip-build --root %{buildroot}
66 
+python2 setup.py install -O1 --skip-build --root %{buildroot}
67 67 
 rm -rf %{buildroot}%{_datadir}/doc/pycurl
68 68 
 chmod 755 %{buildroot}%{python2_sitelib}/pycurl*.so
69 69 
 pushd ../p3dir
... ... 
@@ -95,6 +95,8 @@ rm -rf %{buildroot}
95 95 
 %doc COPYING-LGPL COPYING-MIT RELEASE-NOTES.rst ChangeLog README.rst examples doc tests
96 96
97 97 
 %changelog
98 
+*   Wed May 31 2017 Dheeraj Shetty <dheerajs@vmware.com> 7.43.0-2
99 
+-   Using python2 explicitly while building
98 100 
 *   Mon Apr 03 2017 Rongrong Qiu <rqiu@vmware.com> 7.43.0-1
99 101 
 -   Upgrade to 7.43.0  and add pycurl3
100 102 
 *   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 7.21.5-5
SPECS/python-Twisted/python-Twisted.spec
History View file @ 2d879f6
... ... 
@@ -4,7 +4,7 @@
4 4 
 Summary:        An asynchronous networking framework written in Python
5 5 
 Name:           python-Twisted
6 6 
 Version:        17.1.0
7 
-Release:        4%{?dist}
7 
+Release:        5%{?dist}
8 8 
 License:        MIT
9 9 
 Group:          Development/Languages/Python
10 10 
 Vendor:         VMware, Inc.
... ... 
@@ -63,10 +63,18 @@ python3 setup.py build
63 63 
 popd
64 64
65 65 
 %install
66 
-python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
67 66 
 pushd ../p3dir
68 67 
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
68 
+mv %{buildroot}/%{_bindir}/twistd %{buildroot}/%{_bindir}/twistd3
69 
+mv %{buildroot}/%{_bindir}/trial %{buildroot}/%{_bindir}/trial3
70 
+mv %{buildroot}/%{_bindir}/tkconch %{buildroot}/%{_bindir}/tkconch3
71 
+mv %{buildroot}/%{_bindir}/pyhtmlizer %{buildroot}/%{_bindir}/pyhtmlizer3
72 
+mv %{buildroot}/%{_bindir}/twist %{buildroot}/%{_bindir}/twist3
73 
+mv %{buildroot}/%{_bindir}/conch %{buildroot}/%{_bindir}/conch3
74 
+mv %{buildroot}/%{_bindir}/ckeygen %{buildroot}/%{_bindir}/ckeygen3
75 
+mv %{buildroot}/%{_bindir}/cftp %{buildroot}/%{_bindir}/cftp3
69 76 
 popd
77 
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
70 78
71 79 
 %check
72 80 
 easy_install tox
... ... 
@@ -75,13 +83,31 @@ tox -e py27-tests
75 75 
 %files
76 76 
 %defattr(-,root,root)
77 77 
 %{python2_sitelib}/*
78 
+%{_bindir}/twistd
79 
+%{_bindir}/trial
80 
+%{_bindir}/tkconch
81 
+%{_bindir}/pyhtmlizer
82 
+%{_bindir}/twist
83 
+%{_bindir}/mailmail
84 
+%{_bindir}/conch
85 
+%{_bindir}/ckeygen
86 
+%{_bindir}/cftp
78 87
79 88 
 %files -n python3-Twisted
80 89 
 %defattr(-,root,root)
81 90 
 %{python3_sitelib}/*
82 
-%{_bindir}/*
91 
+%{_bindir}/twistd3
92 
+%{_bindir}/trial3
93 
+%{_bindir}/tkconch3
94 
+%{_bindir}/pyhtmlizer3
95 
+%{_bindir}/twist3
96 
+%{_bindir}/conch3
97 
+%{_bindir}/ckeygen3
98 
+%{_bindir}/cftp3
83 99
84 100 
 %changelog
101 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 17.1.0-5
102 
+-   Adding python3 scripts to bin directory
85 103 
 *   Tue May 09 2017 Rongrong Qiu <rqiu@vmware.com> 17.1.0-4
86 104 
 -   Added python-constantly to the requires.
87 105 
 *   Mon Mar 27 2017 Xiaolin Li <xiaolinl@vmware.com> 17.1.0-3
SPECS/python-alabaster/python-alabaster.spec
History View file @ 2d879f6
... ... 
@@ -1,9 +1,9 @@
1 
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1 
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 2 
 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3 3
4 4 
 Name:           python-alabaster
5 5 
 Version:        0.7.10
6 
-Release:        1%{?dist}
6 
+Release:        2%{?dist}
7 7 
 Summary:        A configurable sidebar-enabled Sphinx theme
8 8 
 License:        BSD
9 9 
 Group:          Development/Languages/Python
... ... 
@@ -58,12 +58,14 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
58 58
59 59 
 %files
60 60 
 %defattr(-,root,root,-)
61 
-%{python_sitelib}/*
61 
+%{python2_sitelib}/*
62 62
63 63 
 %files -n python3-alabaster
64 64 
 %defattr(-,root,root,-)
65 65 
 %{python3_sitelib}/*
66 66
67 67 
 %changelog
68 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.7.10-2
69 
+-   Changed python to python2
68 70 
 *   Tue Apr 25 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.7.10-1
69 71 
 -   Initial
SPECS/python-appdirs/python-appdirs.spec
History View file @ 2d879f6
... ... 
@@ -1,9 +1,9 @@
1 
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1 
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 2 
 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3 3
4 4 
 Name:           python-appdirs
5 5 
 Version:        1.4.3
6 
-Release:        1%{?dist}
6 
+Release:        2%{?dist}
7 7 
 Summary:        Python 2 and 3 compatibility utilities
8 8 
 License:        MIT
9 9 
 Group:          Development/Languages/Python
... ... 
@@ -38,26 +38,28 @@ Python 3 version.
38 38 
 %setup -n appdirs-%{version}
39 39
40 40 
 %build
41 
-python setup.py build
41 
+python2 setup.py build
42 42 
 python3 setup.py build
43 43
44 44 
 %install
45 
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
45 
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
46 46 
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
47 47
48 48 
 %check
49 49 
 easy_install py
50 
-%{__python} test_appdirs.py
50 
+python2 test_appdirs.py
51 51 
 python3 test_appdirs.py
52 52
53 53 
 %files
54 54 
 %defattr(-,root,root,-)
55 
-%{python_sitelib}/*
55 
+%{python2_sitelib}/*
56 56
57 57 
 %files -n python3-appdirs
58 58 
 %defattr(-,root,root,-)
59 59 
 %{python3_sitelib}/*
60 60
61 61 
 %changelog
62 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.4.3-2
63 
+-   Change python to python2
62 64 
 *   Mon Apr 03 2017 Sarah Choi <sarahc@vmware.com> 1.4.3-1
63 65 
 -   Create appdirs 1.4.3
SPECS/python-automat/python-automat.spec
History View file @ 2d879f6
... ... 
@@ -76,10 +76,11 @@ python3 setup.py build
76 76 
 popd
77 77
78 78 
 %install
79 
-python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
80 79 
 pushd ../p3dir
81 80 
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
81 
+mv %{buildroot}/%{_bindir}/automat-visualize %{buildroot}/%{_bindir}/automat-visualize3
82 82 
 popd
83 
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
83 84
84 85 
 %check
85 86 
 python2 setup.py test
... ... 
@@ -90,12 +91,15 @@ popd
90 90 
 %files
91 91 
 %defattr(-,root,root)
92 92 
 %{python2_sitelib}/*
93 
+%{_bindir}/automat-visualize
93 94
94 95 
 %files -n python3-automat
95 96 
 %defattr(-,root,root)
96 97 
 %{python3_sitelib}/*
97 
-%{_bindir}/*
98 
+%{_bindir}/automat-visualize3
98 99
99 100 
 %changelog
101 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.5.0-1
102 
+-   Separate the python3 and python2 scripts in bin directory
100 103 
 *   Mon Mar 20 2017 Xiaolin Li <xiaolinl@vmware.com> 0.5.0-1
101 104 
 -   Initial packaging for Photon
SPECS/python-babel/python-babel.spec
History View file @ 2d879f6
... ... 
@@ -1,9 +1,9 @@
1 
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1 
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 2 
 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3 3
4 4 
 Name:           python-babel
5 5 
 Version:        2.4.0
6 
-Release:        1%{?dist}
6 
+Release:        2%{?dist}
7 7 
 Summary:        an integrated collection of utilities that assist in internationalizing and localizing Python applications
8 8 
 License:        BSD3
9 9 
 Group:          Development/Languages/Python
... ... 
@@ -58,10 +58,11 @@ python3 setup.py build
58 58 
 popd
59 59
60 60 
 %install
61 
-python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
62 61 
 pushd ../p3dir
63 62 
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
63 
+mv %{buildroot}/%{_bindir}/pybabel %{buildroot}/%{_bindir}/pybabel3
64 64 
 popd
65 
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
65 66
66 67 
 %check
67 68 
 python2 setup.py test
... ... 
@@ -71,13 +72,16 @@ popd
71 71
72 72 
 %files
73 73 
 %defattr(-,root,root,-)
74 
-%{python_sitelib}/*
74 
+%{_bindir}/pybabel
75 
+%{python2_sitelib}/*
75 76
76 77 
 %files -n python3-babel
77 78 
 %defattr(-,root,root,-)
78 
-%{_bindir}/pybabel
79 
+%{_bindir}/pybabel3
79 80 
 %{python3_sitelib}/*
80 81
81 82 
 %changelog
83 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 2.4.0-2
84 
+-   Change python to python2 and add python2 scripts to bin directory
82 85 
 *   Tue Apr 25 2017 Dheeraj Shetty <dheerajs@vmware.com> 2.4.0-1
83 86 
 -   Initial
SPECS/python-configparser/python-configparser.spec
History View file @ 2d879f6
... ... 
@@ -1,10 +1,10 @@
1 
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1 
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 2 
 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3 3
4 4 
 Summary:        This library brings the updated configparser from Python 3.5 to Python 2.6-3.5.
5 5 
 Name:           python-configparser
6 6 
 Version:        3.5.0
7 
-Release:        1%{?dist}
7 
+Release:        2%{?dist}
8 8 
 License:        MIT
9 9 
 Group:          Development/Languages/Python
10 10 
 Vendor:         VMware, Inc.
... ... 
@@ -40,26 +40,28 @@ Python 3 version.
40 40 
 %setup -q -n configparser-%{version}
41 41
42 42 
 %build
43 
-python setup.py build
43 
+python2 setup.py build
44 44 
 python3 setup.py build
45 45
46 46 
 %install
47 
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
47 
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
48 48 
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
49 49
50 50 
 %check
51 51 
 easy_install py
52 
-python setup.py test
52 
+python2 setup.py test
53 53 
 python3 setup.py test
54 54
55 55 
 %files
56 56 
 %defattr(-,root,root,-)
57 
-%{python_sitelib}/*
57 
+%{python2_sitelib}/*
58 58
59 59 
 %files -n python3-configparser
60 60 
 %defattr(-,root,root,-)
61 61 
 %{python3_sitelib}/*
62 62
63 63 
 %changelog
64 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.5.0-2
65 
+-   Changed python to python2
64 66 
 *   Thu Feb 02 2017 Xiaolin Li <xiaolinl@vmware.com> 3.5.0-1
65 67 
 -   Initial packaging for Photon
SPECS/python-coverage/python-coverage.spec
History View file @ 2d879f6
... ... 
@@ -1,10 +1,12 @@
1 1 
 %{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 2 
 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3 
+%{!?python3_version: %define python3_version %(python3 -c "import sys; sys.stdout.write(sys.version[:3])")}
4 
+%{!?python2_version: %define python2_version %(python2 -c "import sys; sys.stdout.write(sys.version[:3])")}
3 5
4 6 
 Summary:        Code coverage measurement for Python.
5 7 
 Name:           python-coverage
6 8 
 Version:        4.3.4
7 
-Release:        1%{?dist}
9 
+Release:        2%{?dist}
8 10 
 License:        Apache 2.0
9 11 
 Group:          Development/Languages/Python
10 12 
 Vendor:         VMware, Inc.
... ... 
@@ -62,12 +64,18 @@ popd
62 62 
 %files
63 63 
 %defattr(-,root,root)
64 64 
 %{python2_sitelib}/*
65 
+%{_bindir}/coverage2
66 
+%{_bindir}/coverage-%{python2_version}
65 67
66 68 
 %files -n python3-coverage
67 69 
 %defattr(-,root,root)
68 70 
 %{python3_sitelib}/*
69 
-%{_bindir}/*
71 
+%{_bindir}/coverage
72 
+%{_bindir}/coverage3
73 
+%{_bindir}/coverage-%{python3_version}
70 74
71 75 
 %changelog
76 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 4.3.4-2
77 
+-   Packaging python2 and oython3 scripts in bin directory
72 78 
 *   Wed Apr 05 2017 Xiaolin Li <xiaolinl@vmware.com> 4.3.4-1
73 79 
 -   Initial packaging for Photon
SPECS/python-daemon/python-daemon.spec
History View file @ 2d879f6
... ... 
@@ -4,7 +4,7 @@
4 4 
 Summary:        Library to implement a well-behaved Unix daemon process.
5 5 
 Name:           python-daemon
6 6 
 Version:        2.1.2
7 
-Release:        1%{?dist}
7 
+Release:        2%{?dist}
8 8 
 License:        Apache-2
9 9 
 Url:            https://pypi.python.org/pypi/python-daemon/
10 10 
 Group:          Development/Languages/Python
... ... 
@@ -61,7 +61,7 @@ popd
61 61 
 %check
62 62 
 python2 setup.py test
63 63
64 
-pshd ../p3dir
64 
+pushd ../p3dir
65 65 
 python3 setup.py test
66 66 
 popd
67 67
... ... 
@@ -73,6 +73,8 @@ popd
73 73 
 %{python3_sitelib}/*
74 74
75 75 
 %changelog
76 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 2.1.2-2
77 
+-   Corrected an error in command
76 78 
 *   Fri Mar 24 2017 Xiaolin Li <xiaolinl@vmware.com> 2.1.2-1
77 79 
 -   Initial packaging for Photon
78 80
SPECS/python-docutils/python-docutils.spec
History View file @ 2d879f6
... ... 
@@ -4,7 +4,7 @@
4 4 
 Summary:        Docutils -- Python Documentation Utilities.
5 5 
 Name:           python-docutils
6 6 
 Version:        0.13.1
7 
-Release:        1%{?dist}
7 
+Release:        2%{?dist}
8 8 
 License:        public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)
9 9 
 Group:          Development/Languages/Python
10 10 
 Vendor:         VMware, Inc.
... ... 
@@ -49,10 +49,21 @@ python3 setup.py build
49 49 
 popd
50 50
51 51 
 %install
52 
-python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
53 52 
 pushd ../p3dir
54 53 
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
54 
+mv %{buildroot}/%{_bindir}/rstpep2html.py %{buildroot}/%{_bindir}/rstpep2html3.py
55 
+mv %{buildroot}/%{_bindir}/rst2xml.py %{buildroot}/%{_bindir}/rst2xml3.py
56 
+mv %{buildroot}/%{_bindir}/rst2xetex.py %{buildroot}/%{_bindir}/rst2xetex3.py
57 
+mv %{buildroot}/%{_bindir}/rst2s5.py %{buildroot}/%{_bindir}/rst2s53.py
58 
+mv %{buildroot}/%{_bindir}/rst2pseudoxml.py %{buildroot}/%{_bindir}/rst2pseudoxml3.py
59 
+mv %{buildroot}/%{_bindir}/rst2odt_prepstyles.py %{buildroot}/%{_bindir}/rst2odt_prepstyles3.py
60 
+mv %{buildroot}/%{_bindir}/rst2odt.py %{buildroot}/%{_bindir}/rst2odt3.py
61 
+mv %{buildroot}/%{_bindir}/rst2man.py %{buildroot}/%{_bindir}/rst2man3.py
62 
+mv %{buildroot}/%{_bindir}/rst2latex.py %{buildroot}/%{_bindir}/rst2latex3.py
63 
+mv %{buildroot}/%{_bindir}/rst2html5.py %{buildroot}/%{_bindir}/rst2html53.py
64 
+mv %{buildroot}/%{_bindir}/rst2html.py %{buildroot}/%{_bindir}/rst2html3.py
55 65 
 popd
66 
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
56 67
57 68 
 %check
58 69 
 python2 setup.py test
... ... 
@@ -63,12 +74,35 @@ popd
63 63 
 %files
64 64 
 %defattr(-,root,root)
65 65 
 %{python2_sitelib}/*
66 
+%{_bindir}/rstpep2html.py
67 
+%{_bindir}/rst2xml.py
68 
+%{_bindir}/rst2xetex.py
69 
+%{_bindir}/rst2s5.py
70 
+%{_bindir}/rst2pseudoxml.py
71 
+%{_bindir}/rst2odt_prepstyles.py
72 
+%{_bindir}/rst2odt.py
73 
+%{_bindir}/rst2man.py
74 
+%{_bindir}/rst2latex.py
75 
+%{_bindir}/rst2html5.py
76 
+%{_bindir}/rst2html.py
66 77
67 78 
 %files -n python3-docutils
68 79 
 %defattr(-,root,root)
69 80 
 %{python3_sitelib}/*
70 
-%{_bindir}/*
81 
+%{_bindir}/rstpep2html3.py
82 
+%{_bindir}/rst2xml3.py
83 
+%{_bindir}/rst2xetex3.py
84 
+%{_bindir}/rst2s53.py
85 
+%{_bindir}/rst2pseudoxml3.py
86 
+%{_bindir}/rst2odt_prepstyles3.py
87 
+%{_bindir}/rst2odt3.py
88 
+%{_bindir}/rst2man3.py
89 
+%{_bindir}/rst2latex3.py
90 
+%{_bindir}/rst2html53.py
91 
+%{_bindir}/rst2html3.py
71 92
72 93 
 %changelog
94 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.13.1-2
95 
+-   Create separate packages for python2 and python3 in the bin directory
73 96 
 *   Mon Mar 20 2017 Xiaolin Li <xiaolinl@vmware.com> 0.13.1-1
74 97 
 -   Initial packaging for Photon
SPECS/python-enum/python-enum.spec
History View file @ 2d879f6
... ... 
@@ -1,8 +1,8 @@
1 
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1 
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 2
3 3 
 Name:           python-enum
4 4 
 Version:        0.4.6
5 
-Release:        1%{?dist}
5 
+Release:        2%{?dist}
6 6 
 Summary:        Robust enumerated type support in Python
7 7 
 License:        MIT
8 8 
 Group:          Development/Languages/Python
... ... 
@@ -28,18 +28,20 @@ This package provides a module for robust enumerations in Python.
28 28 
 %setup -n enum-%{version}
29 29
30 30 
 %build
31 
-python setup.py build
31 
+python2 setup.py build
32 32
33 33 
 %install
34 
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
34 
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
35 35
36 36 
 %check
37 
-python setup.py test
37 
+python2 setup.py test
38 38
39 39 
 %files
40 40 
 %defattr(-,root,root,-)
41 
-%{python_sitelib}/*
41 
+%{python2_sitelib}/*
42 42
43 43 
 %changelog
44 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.4.6-2
45 
+-   Changed python to python2
44 46 
 *   Thu Feb 16 2017 Xiaolin Li <xiaolinl@vmware.com> 0.4.6-1
45 47 
 -   Initial packaging for Photon
SPECS/python-enum34/python-enum34.spec
History View file @ 2d879f6
... ... 
@@ -1,8 +1,8 @@
1 
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1 
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 2
3 3 
 Name:           python-enum34
4 4 
 Version:        1.1.6
5 
-Release:        1%{?dist}
5 
+Release:        2%{?dist}
6 6 
 Summary:        Robust enumerated type support in Python
7 7 
 License:        BSD
8 8 
 Group:          Development/Libraries
... ... 
@@ -29,20 +29,22 @@ An enumeration is a set of symbolic names (members) bound to unique, constant va
29 29 
 %setup -n enum34-%{version}
30 30
31 31 
 %build
32 
-python setup.py build
32 
+python2 setup.py build
33 33
34 34 
 %install
35 
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
35 
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
36 36
37 37 
 %check
38 38 
 PATH=%{buildroot}%{_bindir}:${PATH} \
39 39 
 PYTHONPATH=%{buildroot}%{python_sitelib} \
40 
- python enum/test.py
40 
+ python2 enum/test.py
41 41
42 42 
 %files
43 43 
 %defattr(-,root,root,-)
44 
-%{python_sitelib}/*
44 
+%{python2_sitelib}/*
45 45
46 46 
 %changelog
47 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.1.6-2
48 
+-   Changed python to python2
47 49 
 *   Wed Apr 26 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.1.6-1
48 50 
 -   Initial packaging for Photon
SPECS/python-fuse/python-fuse.spec
History View file @ 2d879f6
... ... 
@@ -1,6 +1,8 @@
1 
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 
+
1 3 
 Name:           python-fuse
2 4 
 Version:        0.2.1
3 
-Release:        1%{?dist}
5 
+Release:        2%{?dist}
4 6 
 Summary:        Python interface to libfuse
5 7 
 License:        LGPL
6 8 
 Group:          Development/Languages/Python
... ... 
@@ -26,18 +28,20 @@ FUSE (Filesystem in USErspace) is a simple interface for userspace programs to e
26 26 
 %setup -n %{name}-%{version}
27 27
28 28 
 %build
29 
-python setup.py build
29 
+python2 setup.py build
30 30
31 31 
 %install
32 
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
32 
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
33 33
34 34 
 %check
35 35 
 easy_install py
36 36
37 37 
 %files
38 38 
 %defattr(-,root,root,-)
39 
-%{python_sitelib}/fuse*
39 
+%{python2_sitelib}/fuse*
40 40
41 41 
 %changelog
42 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.2.1-2
43 
+-   Change python to python2
42 44 
 *   Thu Apr 06 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.2.1-1
43 45 
 -   Initial version of python-fuse package for Photon.
SPECS/python-gevent/python-gevent.spec
History View file @ 2d879f6
... ... 
@@ -1,11 +1,10 @@
1 1 
 %{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 2 
 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3 
-%{!?python3_version: %define python_version %(python3 -c "import sys; sys.stdout.write(sys.version[:3])")}
4 3
5 4 
 Summary:        Coroutine-based network library
6 5 
 Name:           python-gevent
7 6 
 Version:        1.2.1
8 
-Release:        2%{?dist}
7 
+Release:        3%{?dist}
9 8 
 License:        MIT
10 9 
 Group:          Development/Languages/Python
11 10 
 Vendor:         VMware, Inc.
... ... 
@@ -70,6 +69,8 @@ python3 setup.py test
70 70 
 %{python3_sitelib}/*
71 71
72 72 
 %changelog
73 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.2.1-3
74 
+-   Removed erroneous line
73 75 
 *   Tue May 16 2017 Rongrong Qiu <rqiu@vmware.com> 1.2.1-2
74 76 
 -   Add requires python-greenlet and python3-greenlet
75 77 
 *   Thu Mar 02 2017 Xiaolin Li <xiaolinl@vmware.com> 1.2.1-1
SPECS/python-hypothesis/python-hypothesis.spec
History View file @ 2d879f6
... ... 
@@ -1,9 +1,9 @@
1 
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1 
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 2 
 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3 3
4 4 
 Name:           python-hypothesis
5 5 
 Version:        3.8.2
6 
-Release:        1%{?dist}
6 
+Release:        2%{?dist}
7 7 
 Summary:        Python library for creating unit tests which are simpler to write and more powerful
8 8 
 License:        MPLv2.0
9 9 
 Group:          Development/Languages/Python
... ... 
@@ -63,12 +63,14 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
63 63
64 64 
 %files
65 65 
 %defattr(-,root,root,-)
66 
-%{python_sitelib}/*
66 
+%{python2_sitelib}/*
67 67
68 68 
 %files -n python3-hypothesis
69 69 
 %defattr(-,root,root,-)
70 70 
 %{python3_sitelib}/*
71 71
72 72 
 %changelog
73 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.8.2-2
74 
+-   Changed python to python2
73 75 
 *   Tue Apr 25 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.8.2-1
74 76 
 -   Initial
SPECS/python-imagesize/python-imagesize.spec
History View file @ 2d879f6
... ... 
@@ -1,9 +1,9 @@
1 
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1 
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 2 
 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3 3
4 4 
 Name:           python-imagesize
5 5 
 Version:        0.7.1
6 
-Release:        1%{?dist}
6 
+Release:        2%{?dist}
7 7 
 Summary:        python module to analyze jpeg/jpeg2000/png/gif image header and return image size.
8 8 
 License:        MIT
9 9 
 Group:          Development/Languages/Python
... ... 
@@ -56,17 +56,19 @@ python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
56 56 
 popd
57 57
58 58 
 %check
59 
-py.test-2
60 
-py.test-3
59 
+py.test2
60 
+py.test3
61 61
62 62 
 %files
63 63 
 %defattr(-,root,root,-)
64 
-%{python_sitelib}/*
64 
+%{python2_sitelib}/*
65 65
66 66 
 %files -n python3-imagesize
67 67 
 %defattr(-,root,root,-)
68 68 
 %{python3_sitelib}/*
69 69
70 70 
 %changelog
71 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.7.1-2
72 
+-   Change python to python2
71 73 
 *   Tue Apr 25 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.7.1-1
72 74 
 -   Initial
SPECS/python-iniparse/python-iniparse.spec
History View file @ 2d879f6
... ... 
@@ -3,7 +3,7 @@
3 3
4 4 
 Name:           python-iniparse
5 5 
 Version:        0.4
6 
-Release:        4%{?dist}
6 
+Release:        5%{?dist}
7 7 
 Summary:        Python Module for Accessing and Modifying Configuration Data in INI files
8 8 
 Group:          Development/Libraries
9 9 
 License:        MIT
... ... 
@@ -62,12 +62,12 @@ mv %{buildroot}/usr/share/doc/iniparse-%{version} %{buildroot}/usr/share/doc/pyt
62 62 
 %check
63 63 
 cp -r iniparse/ tests/
64 64 
 cd tests
65 
-python test_misc.py
66 
-python test_tidy.py
67 
-python test_fuzz.py
68 
-python test_ini.py
69 
-python test_multiprocessing.py
70 
-python test_unicode.py
65 
+python2 test_misc.py
66 
+python2 test_tidy.py
67 
+python2 test_fuzz.py
68 
+python2 test_ini.py
69 
+python2 test_multiprocessing.py
70 
+python2 test_unicode.py
71 71
72 72 
 pushd ../p3dir
73 73 
 cp -r iniparse/ tests/
... ... 
@@ -92,6 +92,8 @@ popd
92 92
93 93
94 94 
 %changelog
95 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.4-5
96 
+-   Use python2 explicitly to build
95 97 
 *   Mon May 22 2017 Xiaolin Li <xiaolinl@vmware.com> 0.4-4
96 98 
 -   Added python3 subpackage.
97 99 
 *   Mon Oct 03 2016 ChangLee <changLee@vmware.com> 0.4-3
SPECS/python-ipaddress/python-ipaddress.spec
History View file @ 2d879f6
... ... 
@@ -1,8 +1,8 @@
1 
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1 
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 2
3 3 
 Name:           python-ipaddress
4 4 
 Version:        1.0.18
5 
-Release:        1%{?dist}
5 
+Release:        2%{?dist}
6 6 
 Summary:        Port of the 3.3+ ipaddress module to 2.6, 2.7, 3.2
7 7 
 License:        MIT
8 8 
 Group:          Development/Languages/Python
... ... 
@@ -28,18 +28,20 @@ IPv4/IPv6 manipulation library
28 28 
 %setup -n ipaddress-%{version}
29 29
30 30 
 %build
31 
-python setup.py build
31 
+python2 setup.py build
32 32
33 33 
 %install
34 
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
34 
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
35 35
36 36 
 %check
37 
-python setup.py test
37 
+python2 setup.py test
38 38
39 39 
 %files
40 40 
 %defattr(-,root,root,-)
41 
-%{python_sitelib}/*
41 
+%{python2_sitelib}/*
42 42
43 43 
 %changelog
44 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.0.18-2
45 
+-   Change python to python2
44 46 
 *   Thu Feb 16 2017 Xiaolin Li <xiaolinl@vmware.com> 1.0.18-1
45 47 
 -   Initial packaging for Photon
SPECS/python-jinja2/python-jinja2.spec
History View file @ 2d879f6
... ... 
@@ -1,9 +1,10 @@
1 
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1 2 
 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 3 
 %{!?python3_version: %define python3_version %(python3 -c "import sys; sys.stdout.write(sys.version[:3])")}
3 4
4 5 
 Name:           python-jinja2
5 6 
 Version:        2.9.5
6 
-Release:        4%{?dist}
7 
+Release:        5%{?dist}
7 8 
 Url:            http://jinja.pocoo.org/
8 9 
 Summary:        A fast and easy to use template engine written in pure Python
9 10 
 License:        BSD
... ... 
@@ -45,7 +46,7 @@ rm -rf ../p3dir
45 45 
 cp -a . ../p3dir
46 46
47 47 
 %build
48 
-python setup.py build
48 
+python2 setup.py build
49 49 
 sed -i 's/\r$//' LICENSE # Fix wrong EOL encoding
50 50 
 pushd ../p3dir
51 51 
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
... ... 
@@ -53,7 +54,7 @@ sed -i 's/\r$//' LICENSE # Fix wrong EOL encoding
53 53 
 popd
54 54
55 55 
 %install
56 
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
56 
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
57 57 
 pushd ../p3dir
58 58 
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
59 59 
 popd
... ... 
@@ -65,8 +66,8 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
65 65 
 %defattr(-,root,root)
66 66 
 %doc AUTHORS CHANGES
67 67 
 %license LICENSE
68 
-%{python_sitelib}/jinja2
69 
-%{python_sitelib}/Jinja2-%{version}-py%{python_version}.egg-info
68 
+%{python2_sitelib}/jinja2
69 
+%{python2_sitelib}/Jinja2-%{version}-py%{python_version}.egg-info
70 70
71 71 
 %files -n python3-jinja2
72 72 
 %defattr(-,root,root)
... ... 
@@ -76,6 +77,8 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
76 76 
 %{python3_sitelib}/Jinja2-%{version}-py%{python3_version}.egg-info
77 77
78 78 
 %changelog
79 
+*   Thu Jun 15 2017 Dheeraj Shetty <dheerajs@vmware.com> 2.9.5-5
80 
+-   Change python to python2
79 81 
 *   Mon Jun 12 2017 Kumar Kaushik <kaushikk@vmware.com> 2.9.5-4
80 82 
 -   Fixing import error in python3.
81 83 
 *   Wed Apr 26 2017 Dheeraj Shetty <dheerajs@vmware.com> 2.9.5-3
SPECS/python-jsonpatch/python-jsonpatch.spec
History View file @ 2d879f6
... ... 
@@ -3,7 +3,7 @@
3 3
4 4 
 Name:           python-jsonpatch
5 5 
 Version:        1.15
6 
-Release:        3%{?dist}
6 
+Release:        4%{?dist}
7 7 
 Summary:        Applying JSON Patches in Python
8 8 
 License:        Modified BSD License
9 9 
 Group:          Development/Languages/Python
... ... 
@@ -45,9 +45,9 @@ popd
45 45 
 %install
46 46 
 pushd ../p3dir
47 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
50 48 
 popd
49 
+mv %{buildroot}/%{_bindir}/jsondiff %{buildroot}/%{_bindir}/jsondiff3
50 
+mv %{buildroot}/%{_bindir}/jsonpatch %{buildroot}/%{_bindir}/jsonpatch3
51 51 
 python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
52 52
53 53 
 %check
... ... 
@@ -69,6 +69,8 @@ popd
69 69 
 %{_bindir}/jsonpatch3
70 70
71 71 
 %changelog
72 
+*       Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.15-4
73 
+-       Separate python3 and python2 specific scripts in bin directory
72 74 
 *       Thu Apr 27 2017 Sarah Choi <sarahc@vmware.com> 1.15-3
73 75 
 -       Rename jsonpatch for python3
74 76 
 *       Thu Apr 06 2017 Sarah Choi <sarahc@vmware.com> 1.15-2
SPECS/python-lxml/python-lxml.spec
History View file @ 2d879f6
... ... 
@@ -1,9 +1,9 @@
1 
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1 
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 2 
 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3 3 
 Summary:        XML and HTML with Python
4 4 
 Name:           python-lxml
5 5 
 Version:        3.7.3
6 
-Release:        1%{?dist}
6 
+Release:        2%{?dist}
7 7 
 Group:          Development/Libraries
8 8 
 License:        BSD
9 9 
 URL:            http://lxml.de
... ... 
@@ -42,11 +42,11 @@ Python 3 version.
42 42 
 %setup -q -n lxml-%{version}
43 43
44 44 
 %build
45 
-%{__python} setup.py build
45 
+python2 setup.py build
46 46 
 python3 setup.py build
47 47
48 48 
 %install
49 
-%{__python} setup.py install --skip-build --root %{buildroot}
49 
+python2 setup.py install --skip-build --root %{buildroot}
50 50 
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
51 51
52 52 
 %check
... ... 
@@ -57,14 +57,16 @@ rm -rf %{buildroot}
57 57
58 58 
 %files
59 59 
 %defattr(-,root,root,-)
60 
-%{python_sitearch}/lxml/*
61 
-%{python_sitearch}/lxml-%{version}-py2.7.egg-info
60 
+%{python2_sitelib}/lxml/*
61 
+%{python2_sitelib}/lxml-%{version}-py2.7.egg-info
62 62
63 63 
 %files -n python3-lxml
64 64 
 %defattr(-,root,root,-)
65 65 
 %{python3_sitelib}/*
66 66
67 67 
 %changelog
68 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.7.3-2
69 
+-   Use python2_sitelib
68 70 
 *   Mon Apr 03 2017 Sarah Choi <sarahc@vmware.com> 3.7.3-1
69 71 
 -   Update to 3.7.3
70 72 
 *   Wed Feb 08 2017 Xiaolin Li <xiaolinl@vmware.com> 3.5.0b1-4
SPECS/python-m2r/python-m2r.spec
History View file @ 2d879f6
... ... 
@@ -4,7 +4,7 @@
4 4 
 Summary:        Markdown to reStructuredText converter.
5 5 
 Name:           python-m2r
6 6 
 Version:        0.1.5
7 
-Release:        1%{?dist}
7 
+Release:        2%{?dist}
8 8 
 License:        MIT
9 9 
 Group:          Development/Languages/Python
10 10 
 Vendor:         VMware, Inc.
... ... 
@@ -53,10 +53,11 @@ python3 setup.py build
53 53 
 popd
54 54
55 55 
 %install
56 
-python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
57 56 
 pushd ../p3dir
58 57 
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
58 
+mv %{buildroot}/%{_bindir}/m2r %{buildroot}/%{_bindir}/m2r3
59 59 
 popd
60 
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
60 61
61 62 
 %check
62 63 
 python2 setup.py test
... ... 
@@ -67,12 +68,15 @@ popd
67 67 
 %files
68 68 
 %defattr(-,root,root)
69 69 
 %{python2_sitelib}/*
70 
+%{_bindir}/m2r
70 71
71 72 
 %files -n python3-m2r
72 73 
 %defattr(-,root,root)
73 74 
 %{python3_sitelib}/*
74 
-%{_bindir}/*
75 
+%{_bindir}/m2r3
75 76
76 77 
 %changelog
78 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.1.5-2
79 
+-   Separate the python2 and python3 scripts in the bin directory
77 80 
 *   Mon Mar 20 2017 Xiaolin Li <xiaolinl@vmware.com> 0.1.5-1
78 81 
 -   Initial packaging for Photon
SPECS/python-mako/python-mako.spec
History View file @ 2d879f6
... ... 
@@ -1,10 +1,9 @@
1 
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1 
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 2 
 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3 
-%{!?python3_version: %define python_version %(python3 -c "import sys; sys.stdout.write(sys.version[:3])")}
4 3
5 4 
 Name:           python-mako
6 5 
 Version:        1.0.6
7 
-Release:        2%{?dist}
6 
+Release:        3%{?dist}
8 7 
 Summary:        Python templating language
9 8 
 License:        MIT
10 9 
 Group:          Development/Languages/Python
... ... 
@@ -36,15 +35,21 @@ Requires:       python3-libs
36 36 
 Python 3 version.
37 37 
 %prep
38 38 
 %setup -n Mako-%{version}
39 
+rm -rf ../p3dir
40 
+cp -a . ../p3dir
39 41
40 42 
 %build
41 
-python setup.py build
43 
+python2 setup.py build
44 
+pushd ../p3dir
42 45 
 python3 setup.py build
46 
+popd
43 47
44 48 
 %install
49 
+pushd ../p3dir
45 50 
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
46 
-mv %{buildroot}/%{_bindir}/mako-render %{buildroot}/%{_bindir}/mako-render-%{python3_version}
47 
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
51 
+mv %{buildroot}/%{_bindir}/mako-render %{buildroot}/%{_bindir}/mako-render3
52 
+popd
53 
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
48 54
49 55 
 %check
50 56 
 easy_install py
... ... 
@@ -53,15 +58,17 @@ python3 test_mako.py
53 53
54 54 
 %files
55 55 
 %defattr(-,root,root,-)
56 
-%{_bindir}/mako-render
57 56 
 %{python_sitelib}/*
57 
+%{_bindir}/mako-render
58 58
59 59 
 %files -n python3-mako
60 60 
 %defattr(-,root,root,-)
61 61 
 %{python3_sitelib}/*
62 
-%{_bindir}/mako-render-%{python3_version}
62 
+%{_bindir}/mako-render3
63 63
64 64 
 %changelog
65 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.0.6-3
66 
+-   Separate the python2 and python3 specific scripts in the bin directory
65 67 
 *   Fri Mar 03 2017 Xiaolin Li <xiaolinl@vmware.com> 1.0.6-2
66 68 
 -   Added python3 package.
67 69 
 *   Fri Feb 03 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.0.6-1
SPECS/python-markupsafe/python-markupsafe.spec
History View file @ 2d879f6
... ... 
@@ -1,11 +1,10 @@
1 1 
 %{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 2 
 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3 
-%{!?python3_version: %define python_version %(python3 -c "import sys; sys.stdout.write(sys.version[:3])")}
4 3
5 4 
 Summary:        A XML/HTML/XHTML Markup safe string for Python.
6 5 
 Name:           python-markupsafe
7 6 
 Version:        1.0
8 
-Release:        1%{?dist}
7 
+Release:        2%{?dist}
9 8 
 License:        BSD
10 9 
 Group:          Development/Languages/Python
11 10 
 Vendor:         VMware, Inc.
... ... 
@@ -60,6 +59,8 @@ python3 setup.py test
60 60 
 %{python3_sitelib}/*
61 61
62 62 
 %changelog
63 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.0-2
64 
+-   Removed erroneous version line
63 65 
 *   Thu Mar 30 2017 Sarah Choi <sarahc@vmware.com> 1.0-1
64 66 
 -   Upgrade version to 1.0
65 67 
 *   Thu Mar 02 2017 Xiaolin Li <xiaolinl@vmware.com> 0.23-1
SPECS/python-netaddr/python-netaddr.spec
History View file @ 2d879f6
... ... 
@@ -3,7 +3,7 @@
3 3
4 4 
 Name:           python-netaddr
5 5 
 Version:        0.7.19
6 
-Release:        2%{?dist}
6 
+Release:        3%{?dist}
7 7 
 Summary:        A network address manipulation library for Python
8 8 
 License:        BSD
9 9 
 Group:          Development/Languages/Python
... ... 
@@ -26,6 +26,7 @@ A network address manipulation library for Python
26 26 
 %package -n python3-netaddr
27 27 
 Summary:        Python3-netaddr
28 28 
 BuildRequires:  python3-devel
29 
+BuildRequires:  python3-libs
29 30
30 31 
 %description -n python3-netaddr
31 32 
 Python 3 version.
... ... 
@@ -48,7 +49,6 @@ mv %{buildroot}/%{_bindir}/netaddr %{buildroot}/%{_bindir}/netaddr3
48 48 
 popd
49 49 
 python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
50 50
51 
-
52 51 
 %check
53 52 
 easy_install py
54 53 
 python2 test_netadr.py
... ... 
@@ -58,15 +58,17 @@ popd
58 58
59 59 
 %files
60 60 
 %defattr(-,root,root,-)
61 
-/usr/bin/netaddr
62 61 
 %{python2_sitelib}/*
62 
+%{_bindir}/netaddr
63 63
64 64 
 %files -n python3-netaddr
65 65 
 %defattr(-,root,root,-)
66 
-/usr/bin/netaddr3
66 
+%{_bindir}/netaddr3
67 67 
 %{python3_sitelib}/*
68 68
69 69 
 %changelog
70 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.7.19-3
71 
+-   Separate python2 and python3 bindings
70 72 
 *   Mon Mar 27 2017 XIaolin Li <xiaolinl@vmware.com> 0.7.19-2
71 73 
 -   Added python3 package.
72 74 
 *   Fri Feb 03 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.7.19-1
SPECS/python-pbr/python-pbr.spec
History View file @ 2d879f6
... ... 
@@ -4,7 +4,7 @@
4 4 
 Summary:        Python Build Reasonableness
5 5 
 Name:           python-pbr
6 6 
 Version:        2.1.0
7 
-Release:        2%{?dist}
7 
+Release:        3%{?dist}
8 8 
 License:        ASL 2.0
9 9 
 Group:          Development/Languages/Python
10 10 
 Vendor:         VMware, Inc.
... ... 
@@ -43,6 +43,7 @@ popd
43 43 
 %install
44 44 
 pushd ../p3dir
45 45 
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
46 
+mv %{buildroot}/%{_bindir}/pbr %{buildroot}/%{_bindir}/pbr3
46 47 
 popd
47 48 
 python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
48 49
... ... 
@@ -64,10 +65,13 @@ popd
64 64 
 %defattr(-,root,root)
65 65 
 %license LICENSE
66 66 
 %doc README.rst
67 
+%{_bindir}/pbr3
67 68 
 %{python3_sitelib}/pbr-%{version}-*.egg-info
68 69 
 %{python3_sitelib}/pbr
69 70
70 71 
 %changelog
72 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 2.1.0-3
73 
+-   Create pbr3 script
71 74 
 *   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.1.0-2
72 75 
 -   Fix arch
73 76 
 *   Fri Apr 14 2017 Dheeraj Shetty <dheerajs@vmware.com> 2.1.0-1
SPECS/python-pip/python-pip.spec
History View file @ 2d879f6
... ... 
@@ -1,6 +1,7 @@
1 
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1 2 
 Name:           python-pip
2 3 
 Version:        9.0.1
3 
-Release:        4%{?dist}
4 
+Release:        5%{?dist}
4 5 
 Url:            https://pypi.python.org/pypi/pip
5 6 
 Summary:        The PyPA recommended tool for installing Python packages.
6 7 
 License:        MIT
... ... 
@@ -28,21 +29,23 @@ The PyPA recommended tool for installing Python packages.
28 28 
 %setup -q -n pip-%{version}
29 29
30 30 
 %build
31 
-python setup.py build
31 
+python2 setup.py build
32 32
33 33 
 %install
34 
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
34 
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
35 35
36 36 
 %check
37 37 
 easy_install freezegun
38 
-%{__python} setup.py test
38 
+python2 setup.py test
39 39
40 40 
 %files
41 41 
 %defattr(-,root,root)
42 
-%{python_sitelib}/*
42 
+%{python2_sitelib}/*
43 43 
 %{_bindir}/*
44 44
45 45 
 %changelog
46 
+*   Thu Jun 15 2017 Dheeraj Shetty <dheerajs@vmware.com> 9.0.1-5
47 
+-   Use python2 explicitly
46 48 
 *   Wed Jun 07 2017 Xiaolin Li <xiaolinl@vmware.com> 9.0.1-4
47 49 
 -   Add python-xml to requires.
48 50 
 *   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 9.0.1-3
SPECS/python-py/python-py.spec
History View file @ 2d879f6
... ... 
@@ -1,9 +1,9 @@
1 
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1 
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 2 
 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3 3
4 4 
 Name:           python-py
5 5 
 Version:        1.4.33
6 
-Release:        1%{?dist}
6 
+Release:        2%{?dist}
7 7 
 Summary:        Python development support library
8 8 
 License:        MIT
9 9 
 Group:          Development/Languages/Python
... ... 
@@ -65,12 +65,14 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
65 65
66 66 
 %files
67 67 
 %defattr(-,root,root,-)
68 
-%{python_sitelib}/*
68 
+%{python2_sitelib}/*
69 69
70 70 
 %files -n python3-py
71 71 
 %defattr(-,root,root,-)
72 72 
 %{python3_sitelib}/*
73 73
74 74 
 %changelog
75 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.4.33-2
76 
+-   Use python2_sitelib
75 77 
 *   Tue Apr 25 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.4.33-1
76 78 
 -   Initial
SPECS/python-pyOpenSSL/python-pyOpenSSL.spec
History View file @ 2d879f6
... ... 
@@ -1,9 +1,9 @@
1 
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1 
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 2 
 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3 3 
 Summary:        Python wrapper module around the OpenSSL library
4 4 
 Name:           python-pyOpenSSL
5 5 
 Version:        16.2.0
6 
-Release:        2%{?dist}
6 
+Release:        3%{?dist}
7 7 
 Url:            https://github.com/pyca/pyopenssl
8 8 
 License:        ASL 2.0
9 9 
 Group:          Development/Languages/Python
... ... 
@@ -43,26 +43,28 @@ Python 3 version.
43 43 
 %setup -q -n pyopenssl-%{version}
44 44
45 45 
 %build
46 
-python setup.py build
46 
+python2 setup.py build
47 47 
 python3 setup.py build
48 48
49 49 
 %install
50 
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
50 
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
51 51 
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
52 52
53 53 
 %check
54 
-python setup.py test
54 
+python2 setup.py test
55 55 
 python3 setup.py test
56 56
57 57 
 %files
58 58 
 %defattr(-,root,root)
59 
-%{python_sitelib}/*
59 
+%{python2_sitelib}/*
60 60
61 61 
 %files -n python3-pyOpenSSL
62 62 
 %defattr(-,root,root,-)
63 63 
 %{python3_sitelib}/*
64 64
65 65 
 %changelog
66 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 16.2.0-3
67 
+-   Use python2 explicitly
66 68 
 *   Tue Feb 21 2017 Xiaolin Li <xiaolinl@vmware.com> 16.2.0-2
67 69 
 -   Add Requires for python-enum and python-ipaddress
68 70 
 *   Tue Feb 14 2017 Xiaolin Li <xiaolinl@vmware.com> 16.2.0-1
SPECS/python-pycparser/python-pycparser.spec
History View file @ 2d879f6
... ... 
@@ -3,7 +3,7 @@
3 3 
 Summary:        Python C parser
4 4 
 Name:           python-pycparser
5 5 
 Version:        2.17
6 
-Release:        2%{?dist}
6 
+Release:        3%{?dist}
7 7 
 Url:            https://pypi.python.org/pypi/pycparser
8 8 
 License:        BSD
9 9 
 Group:          Development/Languages/Python
... ... 
@@ -44,12 +44,12 @@ python2 setup.py build
44 44 
 python3 setup.py build
45 45
46 46 
 %install
47 
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
47 
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
48 48 
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
49 49
50 50 
 %check
51 51 
 cd tests
52 
-python all_tests.py
52 
+python2 all_tests.py
53 53
54 54 
 %files
55 55 
 %defattr(-,root,root)
... ... 
@@ -60,6 +60,8 @@ python all_tests.py
60 60 
 %{python3_sitelib}/*
61 61
62 62 
 %changelog
63 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 2.17-3
64 
+-   Use python2 instead of python
63 65 
 *   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.17-2
64 66 
 -   Fix arch
65 67 
 *   Thu Mar 23 2017 Xiaolin Li <xiaolinl@vmware.com> 2.17-1
SPECS/python-pytest/python-pytest.spec
History View file @ 2d879f6
... ... 
@@ -1,11 +1,11 @@
1 
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1 
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 2 
 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3 3 
 %{!?python2_version: %define python2_version %(python2 -c "import sys; sys.stdout.write(sys.version[:3])")}
4 4 
 %{!?python3_version: %define python3_version %(python3 -c "import sys; sys.stdout.write(sys.version[:3])")}
5 5
6 6 
 Name:           python-pytest
7 7 
 Version:        3.0.7
8 
-Release:        1%{?dist}
8 
+Release:        2%{?dist}
9 9 
 Summary:        pytest is a mature full-featured Python testing tool that helps you write better programs
10 10 
 License:        MIT
11 11 
 Group:          Development/Languages/Python
... ... 
@@ -62,18 +62,18 @@ popd
62 62 
 %install
63 63 
 python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
64 64
65 
-mv %{buildroot}%{_bindir}/pytest %{buildroot}%{_bindir}/pytest-%{python2_version}
66 
-ln -snf pytest-%{python2_version} %{buildroot}%{_bindir}/pytest-2
67 
-mv %{buildroot}%{_bindir}/py.test %{buildroot}%{_bindir}/py.test-%{python2_version}
68 
-ln -snf py.test-%{python2_version} %{buildroot}%{_bindir}/py.test-2
65 
+mv %{buildroot}%{_bindir}/pytest %{buildroot}%{_bindir}/pytest%{python2_version}
66 
+ln -snf pytest%{python2_version} %{buildroot}%{_bindir}/pytest2
67 
+mv %{buildroot}%{_bindir}/py.test %{buildroot}%{_bindir}/py.test%{python2_version}
68 
+ln -snf py.test%{python2_version} %{buildroot}%{_bindir}/py.test2
69 69
70 70
71 71 
 pushd ../p3dir
72 72 
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
73 
-mv %{buildroot}%{_bindir}/pytest %{buildroot}%{_bindir}/pytest-%{python3_version}
74 
-ln -snf pytest-%{python3_version} %{buildroot}%{_bindir}/pytest-3
75 
-mv %{buildroot}%{_bindir}/py.test %{buildroot}%{_bindir}/py.test-%{python3_version}
76 
-ln -snf py.test-%{python3_version} %{buildroot}%{_bindir}/py.test-3
73 
+mv %{buildroot}%{_bindir}/pytest %{buildroot}%{_bindir}/pytest%{python3_version}
74 
+ln -snf pytest%{python3_version} %{buildroot}%{_bindir}/pytest3
75 
+mv %{buildroot}%{_bindir}/py.test %{buildroot}%{_bindir}/py.test%{python3_version}
76 
+ln -snf py.test%{python3_version} %{buildroot}%{_bindir}/py.test3
77 77 
 popd
78 78
79 79 
 %check
... ... 
@@ -81,20 +81,22 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
81 81
82 82 
 %files
83 83 
 %defattr(-,root,root,-)
84 
-%{_bindir}/pytest-2
85 
-%{_bindir}/pytest-%{python2_version}
86 
-%{_bindir}/py.test-2
87 
-%{_bindir}/py.test-%{python2_version}
88 
-%{python_sitelib}/*
84 
+%{_bindir}/pytest2
85 
+%{_bindir}/pytest%{python2_version}
86 
+%{_bindir}/py.test2
87 
+%{_bindir}/py.test%{python2_version}
88 
+%{python2_sitelib}/*
89 89
90 90 
 %files -n python3-pytest
91 91 
 %defattr(-,root,root,-)
92 
-%{_bindir}/pytest-3
93 
-%{_bindir}/pytest-%{python3_version}
94 
-%{_bindir}/py.test-3
95 
-%{_bindir}/py.test-%{python3_version}
92 
+%{_bindir}/pytest3
93 
+%{_bindir}/pytest%{python3_version}
94 
+%{_bindir}/py.test3
95 
+%{_bindir}/py.test%{python3_version}
96 96 
 %{python3_sitelib}/*
97 97
98 98 
 %changelog
99 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.0.7-2
100 
+-   Use python2 instead of python and rename the scripts in bin directory
99 101 
 *   Tue Apr 25 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.0.7-1
100 102 
 -   Initial
SPECS/python-pytz/python-pytz.spec
History View file @ 2d879f6
... ... 
@@ -66,11 +66,11 @@ popd
66 66 
 %check
67 67 
 PATH=%{buildroot}%{_bindir}:${PATH} \
68 68 
 PYTHONPATH=%{buildroot}%{python2_sitelib} \
69 
-    py.test-%{python2_version} -v
69 
+    py.test%{python2_version} -v
70 70 
 pushd ../p3dir
71 71 
 PATH=%{buildroot}%{_bindir}:${PATH} \
72 72 
 PYTHONPATH=%{buildroot}%{python3_sitelib} \
73 
-    py.test-%{python3_version} -v
73 
+    py.test%{python3_version} -v
74 74 
 popd
75 75
76 76 
 %files
SPECS/python-pyvim/python-pyvim.spec
History View file @ 2d879f6
... ... 
@@ -1,11 +1,10 @@
1 1 
 %{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 2 
 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3 
-%{!?python3_version: %define python_version %(python3 -c "import sys; sys.stdout.write(sys.version[:3])")}
4 3
5 4 
 Summary:        Pure Python Vi Implementation.
6 5 
 Name:           python-pyvim
7 6 
 Version:        0.0.20
8 
-Release:        1%{?dist}
7 
+Release:        2%{?dist}
9 8 
 License:        UNKNOWN
10 9 
 Group:          Development/Languages/Python
11 10 
 Vendor:         VMware, Inc.
... ... 
@@ -46,7 +45,7 @@ python3 setup.py build
46 46
47 47 
 %install
48 48 
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
49 
-mv %{buildroot}/%{_bindir}/pyvim %{buildroot}/%{_bindir}/pyvim-%{python3_version}
49 
+mv %{buildroot}/%{_bindir}/pyvim %{buildroot}/%{_bindir}/pyvim3
50 50 
 python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
51 51
52 52 
 %check
... ... 
@@ -61,8 +60,10 @@ python3 setup.py test
61 61 
 %files -n python3-pyvim
62 62 
 %defattr(-,root,root)
63 63 
 %{python3_sitelib}/*
64 
-%{_bindir}/pyvim-%{python3_version}
64 
+%{_bindir}/pyvim3
65 65
66 66 
 %changelog
67 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.0.20-2
68 
+-   Rectified python3 version
67 69 
 *   Mon Mar 06 2017 Xiaolin Li <xiaolinl@vmware.com> 0.0.20-1
68 
--   Initial packaging for Photon.
69 70 
\ No newline at end of file
71 
+-   Initial packaging for Photon.
SPECS/python-setuptools/python-setuptools.spec
History View file @ 2d879f6
... ... 
@@ -1,9 +1,13 @@
1 
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 
+
1 3 
 Summary: Download, build, install, upgrade, and uninstall Python packages
2 4 
 Name: python-setuptools
3 5 
 Version: 34.3.3
4 
-Release: 1%{?dist}
6 
+Release: 2%{?dist}
5 7 
 License: Python or ZPLv2.0
6 8 
 Group: Development/Languages
9 
+Vendor: VMware, Inc.
10 
+Distribution: Photon
7 11 
 URL: https://pypi.python.org/pypi/setuptools
8 12
9 13 
 Source0: https://pypi.python.org/packages/d5/b7/e52b7dccd3f91eec858309dcd931c1387bf70b6d458c86a9bfcb50134fbd/setuptools-%{version}.zip
... ... 
@@ -35,19 +39,19 @@ have dependencies on other packages.
35 35 
 %setup -n setuptools-%{version}
36 36
37 37 
 %build
38 
-%{__python} setup.py build
38 
+python2 setup.py build
39 39
40 40 
 %install
41 41 
 %{__rm} -rf %{buildroot}
42 
-%{__python} setup.py install -O1 --skip-build \
42 
+python2 setup.py install -O1 --skip-build \
43 43 
     --root "%{buildroot}" \
44 44 
     --single-version-externally-managed
45 
-find %{buildroot}%{python_sitelib} -name '*.exe' | xargs rm -f
46 
-find %{buildroot}%{python_sitelib} -name '*.txt' | xargs chmod -x
47 
-chmod +x %{buildroot}%{python_sitelib}/setuptools/command/easy_install.py
45 
+find %{buildroot}%{python2_sitelib} -name '*.exe' | xargs rm -f
46 
+find %{buildroot}%{python2_sitelib} -name '*.txt' | xargs chmod -x
47 
+chmod +x %{buildroot}%{python2_sitelib}/setuptools/command/easy_install.py
48 48
49 49 
 %check
50 
-%{__python} setup.py test
50 
+python2 setup.py test
51 51
52 52 
 %clean
53 53 
 %{__rm} -rf %{buildroot}
... ... 
@@ -55,9 +59,11 @@ chmod +x %{buildroot}%{python_sitelib}/setuptools/command/easy_install.py
55 55 
 %files
56 56 
 %defattr(-, root, root)
57 57 
 %{_bindir}/*
58 
-%{python_sitelib}/*
58 
+%{python2_sitelib}/*
59 59
60 60 
 %changelog
61 
+*       Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 34.3.3-2
62 
+-       Use python2 explicitly and add Vendor
61 63 
 *       Mon Apr 03 2017 Sarah Choi <sarahc@vmware.com> 34.3.3-1
62 64 
 -       Upgrade to 34.3.3
63 65 
 *       Mon Oct 10 2016 ChangLee <changlee@vmware.com> 21.0.0-3
SPECS/python-simplejson/python-simplejson.spec
History View file @ 2d879f6
... ... 
@@ -4,7 +4,7 @@
4 4 
 Summary:        Simple, fast, extensible JSON encoder/decoder for Python.
5 5 
 Name:           python-simplejson
6 6 
 Version:        3.10.0
7 
-Release:        1%{?dist}
7 
+Release:        2%{?dist}
8 8 
 License:        MIT
9 9 
 Group:          Development/Languages/Python
10 10 
 Vendor:         VMware, Inc.
... ... 
@@ -38,16 +38,16 @@ Python 3 version.
38 38 
 %setup -q -n simplejson-%{version}
39 39
40 40 
 %build
41 
-python setup.py build
41 
+python2 setup.py build
42 42 
 python3 setup.py build
43 43
44 44 
 %install
45 
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
45 
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
46 46 
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
47 47
48 48 
 %check
49 49 
 easy_install py
50 
-python setup.py test
50 
+python2 setup.py test
51 51 
 python3 setup.py test
52 52
53 53 
 %files
... ... 
@@ -59,5 +59,7 @@ python3 setup.py test
59 59 
 %{python3_sitelib}/*
60 60
61 61 
 %changelog
62 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.10.0-2
63 
+-   Use python2 explicitly
62 64 
 *   Wed Mar 01 2017 Xiaolin Li <xiaolinl@vmware.com> 3.10.0-1
63 65 
 -   Initial packaging for Photon
SPECS/python-six/python-six.spec
History View file @ 2d879f6
... ... 
@@ -1,9 +1,9 @@
1 
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1 
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 2 
 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3 3
4 4 
 Name:           python-six
5 5 
 Version:        1.10.0
6 
-Release:        5%{?dist}
6 
+Release:        6%{?dist}
7 7 
 Summary:        Python 2 and 3 compatibility utilities
8 8 
 License:        MIT
9 9 
 Group:          Development/Languages/Python
... ... 
@@ -38,27 +38,29 @@ Python 3 version.
38 38 
 %setup -n six-%{version}
39 39
40 40 
 %build
41 
-python setup.py build
41 
+python2 setup.py build
42 42 
 python3 setup.py build
43 43
44 44 
 %install
45 
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
45 
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
46 46 
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
47 47
48 48 
 %check
49 49 
 easy_install py
50 
-%{__python} test_six.py
50 
+python2 test_six.py
51 51 
 python3 test_six.py
52 52
53 53 
 %files
54 54 
 %defattr(-,root,root,-)
55 
-%{python_sitelib}/*
55 
+%{python2_sitelib}/*
56 56
57 57 
 %files -n python3-six
58 58 
 %defattr(-,root,root,-)
59 59 
 %{python3_sitelib}/*
60 60
61 61 
 %changelog
62 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.10.0-6
63 
+-   Use python2 explicitly
62 64 
 *   Wed Apr 05 2017 Sarah Choi <sarahc@vmware.com> 1.10.0-5
63 65 
 -   Remove python-setuptools from BuildRequires
64 66 
 *   Mon Jan 09 2017 Xiaolin Li <xiaolinl@vmware.com> 1.10.0-4
SPECS/python-snowballstemmer/python-snowballstemmer.spec
History View file @ 2d879f6
... ... 
@@ -1,9 +1,9 @@
1 
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1 
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 2 
 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3 3
4 4 
 Name:           python-snowballstemmer
5 5 
 Version:        1.2.1
6 
-Release:        1%{?dist}
6 
+Release:        2%{?dist}
7 7 
 Summary:        Python stemming library
8 8 
 License:        BSD
9 9 
 Group:          Development/Languages/Python
... ... 
@@ -75,12 +75,14 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
75 75
76 76 
 %files
77 77 
 %defattr(-,root,root,-)
78 
-%{python_sitelib}/*
78 
+%{python2_sitelib}/*
79 79
80 80 
 %files -n python3-snowballstemmer
81 81 
 %defattr(-,root,root,-)
82 82 
 %{python3_sitelib}/*
83 83
84 84 
 %changelog
85 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.2.1-2
86 
+-   Use python2 explicitly
85 87 
 *   Tue Apr 25 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.2.1-1
86 88 
 -   Initial
SPECS/python-sphinx/python-sphinx.spec
History View file @ 2d879f6
... ... 
@@ -1,9 +1,10 @@
1 
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1 2 
 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 3
3 4 
 Summary:       Python documentation generator
4 5 
 Name:          python-sphinx
5 6 
 Version:       1.5.3
6 
-Release:       3%{?dist}
7 
+Release:       4%{?dist}
7 8 
 Group:         Development/Tools
8 9 
 License:       BSD-2-Clause
9 10 
 URL:           http://www.vmware.com
... ... 
@@ -88,16 +89,20 @@ rm -rf ../p3dir
88 88 
 cp -a . ../p3dir
89 89
90 90 
 %build
91 
-python setup.py build
91 
+python2 setup.py build
92 92 
 pushd ../p3dir
93 93 
 python3 setup.py build
94 94 
 popd
95 95
96 96 
 %install
97 
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
98 97 
 pushd ../p3dir
99 98 
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
99 
+mv %{buildroot}/%{_bindir}/sphinx-quickstart %{buildroot}/%{_bindir}/sphinx-quickstart3
100 
+mv %{buildroot}/%{_bindir}/sphinx-build %{buildroot}/%{_bindir}/sphinx-build3
101 
+mv %{buildroot}/%{_bindir}/sphinx-autogen %{buildroot}/%{_bindir}/sphinx-autogen3
102 
+mv %{buildroot}/%{_bindir}/sphinx-apidoc %{buildroot}/%{_bindir}/sphinx-apidoc3
100 103 
 popd
104 
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
101 105
102 106 
 %check
103 107 
 make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
... ... 
@@ -106,14 +111,23 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
106 106
107 107 
 %files
108 108 
 %defattr(-,root,root)
109 
-%{python_sitelib}/*
109 
+%{_bindir}/sphinx-quickstart
110 
+%{_bindir}/sphinx-build
111 
+%{_bindir}/sphinx-autogen
112 
+%{_bindir}/sphinx-apidoc
113 
+%{python2_sitelib}/*
110 114
111 115 
 %files -n python3-sphinx
112 116 
 %defattr(-,root,root)
113 
-%{_bindir}/*
117 
+%{_bindir}/sphinx-quickstart3
118 
+%{_bindir}/sphinx-build3
119 
+%{_bindir}/sphinx-autogen3
120 
+%{_bindir}/sphinx-apidoc3
114 121 
 %{python3_sitelib}/*
115 122
116 123 
 %changelog
124 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.5.3-4
125 
+-   Keep the original python2 scripts and rename the python3 scripts
117 126 
 *   Wed Apr 26 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.5.3-3
118 127 
 -   BuildRequires and Requires python-babel, python-docutils, python-jinja2,
119 128 
     python-Pygments, python-six, python-alabaster, python-imagesize,
SPECS/python-sqlalchemy/python-sqlalchemy.spec
History View file @ 2d879f6
... ... 
@@ -1,7 +1,9 @@
1 
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 
+
1 3 
 Summary:        The Python SQL Toolkit and Object Relational Mapper
2 4 
 Name:           python-sqlalchemy
3 5 
 Version:        1.1.7
4 
-Release:        1%{?dist}
6 
+Release:        2%{?dist}
5 7 
 Url:            http://www.sqlalchemy.org
6 8 
 License:        MIT
7 9 
 Group:          Development/Languages/Python
... ... 
@@ -23,23 +25,25 @@ SQLAlchemy is the Python SQL toolkit and Object Relational Mapper that gives app
23 23 
 %setup -q -n SQLAlchemy-%{version}
24 24
25 25 
 %build
26 
-python setup.py build
26 
+python2 setup.py build
27 27
28 28 
 %check
29 29 
 easy_install apipkg
30 30 
 easy_install py
31 31 
 easy_install mock
32 32 
 export PYTHONPATH=$PYTHONPATH:%{_builddir}/SQLAlchemy-%{version}/.eggs/pytest-3.0.3-py2.7.egg
33 
-%{__python} setup.py test
33 
+python2 setup.py test
34 34
35 35 
 %install
36 
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
36 
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
37 37
38 38 
 %files
39 39 
 %defattr(-,root,root)
40 
-%{python_sitelib}/*
40 
+%{python2_sitelib}/*
41 41
42 42 
 %changelog
43 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.1.7-2
44 
+-   Use python2 explicitly
43 45 
 *   Thu Mar 30 2017 Siju Maliakkal <smaliakal@vmware.com> 1.1.7-1
44 46 
 -   Updating package version to latest
45 47 
 *   Fri Nov 18 2016 Alexey Makhalov <amakhalov@vmware.com> 1.0.15-2
SPECS/python-typing/python-typing.spec
History View file @ 2d879f6
... ... 
@@ -1,8 +1,8 @@
1 
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1 
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 2
3 3 
 Name:           python-typing
4 4 
 Version:        3.6.1
5 
-Release:        1%{?dist}
5 
+Release:        2%{?dist}
6 6 
 Summary:        Type Hints for Python
7 7 
 License:        PSF
8 8 
 Group:          Development/Tools
... ... 
@@ -36,13 +36,15 @@ python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
36 36
37 37 
 %check
38 38 
 PATH=%{buildroot}%{_bindir}:${PATH} \
39 
-PYTHONPATH=%{buildroot}%{python_sitelib} \
39 
+PYTHONPATH=%{buildroot}%{python2_sitelib} \
40 40 
     python2 python2/test_typing.py
41 41
42 42 
 %files
43 43 
 %defattr(-,root,root,-)
44 
-%{python_sitelib}/*
44 
+%{python2_sitelib}/*
45 45
46 46 
 %changelog
47 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.6.1-2
48 
+-   Use python2 explicitly
47 49 
 *   Tue Apr 25 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.6.1-1
48 50 
 -   Initial
SPECS/python-urllib3/python-urllib3.spec
History View file @ 2d879f6
... ... 
@@ -1,9 +1,10 @@
1 
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1 
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 2 
 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3 
+
3 4 
 Summary:        A powerful, sanity-friendly HTTP client for Python.
4 5 
 Name:           python-urllib3
5 6 
 Version:        1.20
6 
-Release:        1%{?dist}
7 
+Release:        2%{?dist}
7 8 
 Url:            https://pypi.python.org/pypi/urllib3
8 9 
 License:        MIT
9 10 
 Group:          Development/Languages/Python
... ... 
@@ -40,25 +41,27 @@ Python 3 version.
40 40 
 %setup -q -n urllib3-%{version}
41 41
42 42 
 %build
43 
-python setup.py build
43 
+python2 setup.py build
44 44 
 python3 setup.py build
45 45
46 46 
 %install
47 
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
47 
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
48 48 
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
49 49
50 50 
 %check
51 
-python setup.py test
51 
+python2 setup.py test
52 52 
 python3 setup.py test
53 53
54 54 
 %files
55 55 
 %defattr(-,root,root)
56 
-%{python_sitelib}/*
56 
+%{python2_sitelib}/*
57 57
58 58 
 %files -n python3-urllib3
59 59 
 %defattr(-,root,root,-)
60 60 
 %{python3_sitelib}/*
61 61
62 62 
 %changelog
63 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.20-2
64 
+-   Use python2 explicitly
63 65 
 *   Thu Feb 02 2017 Xiaolin Li <xiaolinl@vmware.com> 1.20-1
64 66 
 -   Initial packaging for Photon
SPECS/python-zmq/python-zmq.spec
History View file @ 2d879f6
... ... 
@@ -4,7 +4,7 @@
4 4 
 Summary:        Software library for fast, message-based applications
5 5 
 Name:           python-zmq
6 6 
 Version:        16.0.2
7 
-Release:        1%{?dist}
7 
+Release:        2%{?dist}
8 8 
 License:        LGPLv3+ and BSD3
9 9 
 Group:          Development/Languages/Python
10 10 
 Vendor:         VMware, Inc.
... ... 
@@ -25,6 +25,7 @@ python bindings for zeromq
25 25 
 Summary:        Software library for fast, message-based applications
26 26 
 BuildRequires:  python3
27 27 
 BuildRequires:  python3-devel
28 
+BuildRequires:  python3-libs
28 29 
 BuildRequires:  cython3
29 30 
 Requires:       python3
30 31
... ... 
@@ -61,5 +62,7 @@ python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
61 61 
 %{python3_sitelib}/zmq
62 62
63 63 
 %changelog
64 
+*   Fri Apr 14 2017 Dheeraj Shetty <dheerajs@vmware.com> 16.0.2-2
65 
+-   Add python3-libs to BuildRequires
64 66 
 *   Fri Apr 14 2017 Dheeraj Shetty <dheerajs@vmware.com> 16.0.2-1
65 67 
 -   Initial packaging for Photon