1. photon
  2. Commit ba174b201b14aeddbed9e11469a1eb5d0751dff0
Browse code

Build using python2 explicitly

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

DheerajSShetty authored on 2017/06/17 06:38:31
Showing 12 changed files
SPECS/WALinuxAgent/WALinuxAgent.spec
History View file @ ba174b2
... ... 
@@ -1,7 +1,7 @@
1 1 
 Name:           WALinuxAgent
2 2 
 Summary:        The Windows Azure Linux Agent
3 3 
 Version:        2.0.18
4 
-Release:        3%{?dist}
4 
+Release:        4%{?dist}
5 5 
 License:        Apache License Version 2.0
6 6 
 Group:          System/Daemons
7 7 
 Url:            http://go.microsoft.com/fwlink/?LinkId=250998
... ... 
@@ -44,16 +44,16 @@ find . -type f -exec chmod 0644 {} +
44 44 
 %pre -p /bin/sh
45 45
46 46 
 %build
47 
-%{__python} setup.py build
47 
+python2 setup.py build
48 48
49 49 
 %install
50 
-%{__python} setup.py install --prefix=%{_prefix} --lnx-distro='photon' --init-system='systemd' --root=%{buildroot}
50 
+python2 setup.py install --prefix=%{_prefix} --lnx-distro='photon' --init-system='systemd' --root=%{buildroot}
51 51 
 mkdir -p  %{buildroot}/%{_localstatedir}/log
52 52 
 mkdir -p -m 0700 %{buildroot}/%{_sharedstatedir}/waagent
53 53 
 touch %{buildroot}/%{_localstatedir}/log/waagent.log
54 54
55 55 
 %check
56 
-%{__python} setup.py check && %{__python} setup.py test
56 
+python2 setup.py check && python2 setup.py test
57 57
58 58 
 %post
59 59 
 %systemd_post waagent.service
... ... 
@@ -78,8 +78,10 @@ touch %{buildroot}/%{_localstatedir}/log/waagent.log
78 78
79 79
80 80 
 %changelog
81 
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.0.18-3
82 
--	GA - Bump release of all rpms
81 
+* Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 2.0.18-4
82 
+- Use python2 explicitly to build
83 
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.0.18-3
84 
+- GA - Bump release of all rpms
83 85 
 * Tue May 10 2016 Anish Swaminathan <anishs@vmware.com> 2.0.18-2
84 86 
 - Edit post scripts
85 87 
 * Thu Apr 28 2016 Anish Swaminathan <anishs@vmware.com> 2.0.18-1
SPECS/ansible/ansible.spec
History View file @ ba174b2
... ... 
@@ -1,7 +1,9 @@
1 
+%{!?python2_sitelib: %global python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 
+
1 3 
 Summary:        Configuration-management, application deployment, cloud provisioning system
2 4 
 Name:           ansible
3 5 
 Version:        2.2.2.0
4 
-Release:        1%{?dist}
6 
+Release:        2%{?dist}
5 7 
 License:        GPLv3+
6 8 
 URL:            https://www.ansible.com
7 9 
 Group:          Development/Libraries
... ... 
@@ -27,19 +29,21 @@ Ansible is a radically simple IT automation system. It handles configuration-man
27 27 
 %setup -q
28 28
29 29 
 %build
30 
-%{__python} setup.py build
30 
+python2 setup.py build
31 31
32 32 
 %install
33 33 
 %{__rm} -rf %{buildroot}
34 
-%{__python} setup.py install -O1 --skip-build \
34 
+python2 setup.py install -O1 --skip-build \
35 35 
     --root "%{buildroot}"
36 36
37 37 
 %files
38 38 
 %defattr(-, root, root)
39 39 
 %{_bindir}/*
40 
-%{python_sitelib}/*
40 
+%{python2_sitelib}/*
41 41
42 42 
 %changelog
43 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 2.2.2.0-2
44 
+-   Use python2 explicitly
43 45 
 *   Thu Apr 6 2017 Alexey Makhalov <amakhalov@vmware.com> 2.2.2.0-1
44 46 
 -   Version update
45 47 
 *   Wed Sep 21 2016 Xiaolin Li <xiaolinl@vmware.com> 2.1.1.0-1
SPECS/ceph-deploy/ceph-deploy.spec
History View file @ ba174b2
... ... 
@@ -1,6 +1,8 @@
1 
+%{!?python2_sitelib: %global python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 
+
1 3 
 Name:           ceph-deploy
2 4 
 Version:        1.5.37
3 
-Release:        2%{?dist}
5 
+Release:        3%{?dist}
4 6 
 Url:            http://ceph.com/
5 7 
 Summary:        Admin and deploy tool for Ceph
6 8 
 License:        MIT
... ... 
@@ -40,10 +42,10 @@ An easy to use admin tool for deploy ceph storage clusters.
40 40 
 %patch6 -p1
41 41
42 42 
 %build
43 
-python setup.py build
43 
+python2 setup.py build
44 44
45 45 
 %install
46 
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
46 
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
47 47 
 install -m 0755 -D scripts/ceph-deploy $RPM_BUILD_ROOT/usr/bin
48 48
49 49 
 %check
... ... 
@@ -52,10 +54,12 @@ install -m 0755 -D scripts/ceph-deploy $RPM_BUILD_ROOT/usr/bin
52 52 
 %files
53 53 
 %defattr(-,root,root)
54 54 
 %doc LICENSE README.rst
55 
-%{python_sitelib}/*
55 
+%{python2_sitelib}/*
56 56 
 %{_bindir}/ceph-deploy
57 57
58 58 
 %changelog
59 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.5.37-3
60 
+-   Use python2 explicitly
59 61 
 *   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.5.37-2
60 62 
 -   Fix arch
61 63 
 *   Thu Mar 30 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.5.37-1
SPECS/createrepo/createrepo.spec
History View file @ ba174b2
... ... 
@@ -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
3 3 
 Summary: 	Creates a common metadata repository
4 4 
 Name: 		createrepo
5 5 
 Version: 	0.10.4
6 
-Release: 	2%{?dist}
6 
+Release: 	3%{?dist}
7 7 
 License:	GPLv2+
8 8 
 Group: 		System Environment/Base
9 9 
 Vendor:		VMware, Inc.
... ... 
@@ -35,7 +35,7 @@ make DESTDIR=$RPM_BUILD_ROOT install
35 35
36 36 
 %check
37 37 
 pushd pychecker-0.8.19
38 
-python setup.py install
38 
+python2 setup.py install
39 39 
 popd
40 40
41 41 
 make %{?_smp_mflags} check
... ... 
@@ -56,11 +56,13 @@ make %{?_smp_mflags} check
56 56 
 %{_mandir}/man8/createrepo.8*
57 57 
 %{_mandir}/man1/modifyrepo.1*
58 58 
 /etc/bash_completion.d/*
59 
-%{python_sitelib}/createrepo
59 
+%{python2_sitelib}/createrepo
60 60
61 61 
 %changelog
62 
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.10.4-2
63 
--	GA - Bump release of all rpms
62 
+* Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.10.4-3
63 
+- Use python2 explicitly
64 
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.10.4-2
65 
+- GA - Bump release of all rpms
64 66 
 * Tue Feb 23 2016 Kumar Kaushik <kaushikk@vmware.com> 0.10.4
65 67 
 - Updating to new version.
66 68 
 * Thu Dec 20 2007 Seth Vidal <skvidal at fedoraproject.org>
SPECS/deltarpm/deltarpm.spec
History View file @ ba174b2
... ... 
@@ -4,7 +4,7 @@
4 4 
 Summary:        Create deltas between rpms
5 5 
 Name:           deltarpm
6 6 
 Version:        3.6.1
7 
-Release:        2%{?dist}
7 
+Release:        3%{?dist}
8 8 
 License:        BSD
9 9 
 Group:          Applications/System
10 10 
 Vendor:         VMware, Inc.
... ... 
@@ -81,13 +81,15 @@ The python3-deltarpm package contains the python3 bindings for deltarpm.
81 81
82 82 
 %files python
83 83 
 %defattr(-,root,root)
84 
-%{python_sitelib}/*
84 
+%{python2_sitelib}/*
85 85
86 86 
 %files -n python3-deltarpm
87 87 
 %defattr(-,root,root)
88 88 
 %{python3_sitelib}/*
89 89
90 90 
 %changelog
91 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.6.1-3
92 
+-   Use python2_sitelib
91 93 
 *   Thu May 18 2017 Xiaolin Li <xiaolinl@vmware.com> 3.6.1-2
92 94 
 -   Move python2 requires to python subpackage and added python3.
93 95 
 *   Tue Apr 25 2017 Bo Gan <ganb@vmware.com> 3.6.1-1
SPECS/ecdsa/ecdsa.spec
History View file @ ba174b2
... ... 
@@ -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:        ECDSA cryptographic signature library (pure python)
5 5 
 Name:           ecdsa
6 6 
 Version:        0.13
7 
-Release:        3%{?dist}
7 
+Release:        4%{?dist}
8 8 
 License:        MIT
9 9 
 Group:          System Environment/Security
10 10 
 Vendor:         VMware, Inc.
... ... 
@@ -42,12 +42,12 @@ Python 3 version.
42 42 
 %setup -q
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 49 
 %{__rm} -rf %{buildroot}
50 
-%{__python} setup.py install -O1 --skip-build \
50 
+python2 setup.py install -O1 --skip-build \
51 51 
     --root "%{buildroot}" \
52 52 
     --single-version-externally-managed
53 53
... ... 
@@ -56,7 +56,7 @@ python3 setup.py install -O1 --skip-build \
56 56 
     --single-version-externally-managed
57 57
58 58 
 %check
59 
-python setup.py test
59 
+python2 setup.py test
60 60 
 python3 setup.py test
61 61
62 62 
 %clean
... ... 
@@ -64,13 +64,15 @@ python3 setup.py test
64 64
65 65 
 %files
66 66 
 %defattr(-, root, root)
67 
-%{python_sitelib}/*
67 
+%{python2_sitelib}/*
68 68
69 69 
 %files -n python3-ecdsa
70 70 
 %defattr(-, root, root)
71 71 
 %{python3_sitelib}/*
72 72
73 73 
 %changelog
74 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.13-4
75 
+-   Use python2 explicitly
74 76 
 *   Mon Feb 27 2017 Xiaolin Li <xiaolinl@vmware.com> 0.13-3
75 77 
 -   Added python3 site-packages.
76 78 
 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.13-2
SPECS/iotop/iotop.spec
History View file @ ba174b2
... ... 
@@ -1,7 +1,9 @@
1 
+%{!?python2_sitelib: %global python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 
+
1 3 
 Summary:	Iotop is a Python program with a top like UI used to show the processes and their corresponding IO activity.
2 4 
 Name:		iotop
3 5 
 Version:	0.6
4 
-Release:	4%{?dist}
6 
+Release:	5%{?dist}
5 7 
 License:	GPLv2
6 8 
 URL:		http://guichaz.free.fr/iotop/
7 9 
 Group:		System/Monitoring
... ... 
@@ -22,18 +24,18 @@ BuildArch:      noarch
22 22 
 %setup -q
23 23 
 %build
24 24
25 
-python setup.py build
25 
+python2 setup.py build
26 26 
 %install
27 27
28 28 
 #!/bin/bash
29 29 
 # http://bugs.python.org/issue644744
30 
-python setup.py install --prefix=%{_prefix} --root=%{buildroot} --record="INSTALLED_FILES"
30 
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot} --record="INSTALLED_FILES"
31 31 
 # 'brp-compress' gzips the man pages without distutils knowing... fix this
32 32 
 sed -i -e 's@man/man\([[:digit:]]\)/\(.\+\.[[:digit:]]\)$@man/man\1/\2.gz@g' "INSTALLED_FILES"
33 33 
 sed -i -e 's@\(.\+\)\.py$@\1.py*@' \
34 34 
        -e '/.\+\.pyc$/d' \
35 35 
        "INSTALLED_FILES"
36 
-echo "%dir %{python_sitelib}/iotop" >> INSTALLED_FILES
36 
+echo "%dir %{python2_sitelib}/iotop" >> INSTALLED_FILES
37 37
38 38 
 %clean
39 39 
 rm -rf %{buildroot}/*
... ... 
@@ -44,8 +46,10 @@ rm -rf %{buildroot}/*
44 44
45 45
46 46 
 %changelog
47 
+*	Fri Jun 16 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.6-5
48 
+-	Use python2 explicitly
47 49 
 *	Thu Jun 15 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.6-4
48 
--	Add python2 to Reuires
50 
+-	Add python2 to Requires
49 51 
 *	Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.6-3
50 52 
 -	Fix arch
51 53 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.6-2
SPECS/mercurial/mercurial.spec
History View file @ ba174b2
... ... 
@@ -1,19 +1,22 @@
1 
-Summary:        A free, distributed source control management tool.
2 
-Name:           mercurial
3 
-Version:        4.1
4 
-Release:        2%{?dist}
5 
-License:        GPLv2+
6 
-URL:            https://www.ruby-lang.org/en/
7 
-Group:          System Environment/Security
8 
-Vendor:         VMware, Inc.
9 
-Distribution:   Photon
10 
-Source0:        http://mercurial.selenic.com/release/%{name}-%{version}.tar.gz
11 
-%define sha1    mercurial=d5f88e05cbbd8f13dd5fc4004433f54435fc27c8
1 
+%{!?python2_sitelib: %global python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 
+
3 
+Summary:    A free, distributed source control management tool.
4 
+Name:       mercurial
5 
+Version:    4.1
6 
+Release:    3%{?dist}
7 
+License:    GPLv2+
8 
+URL:        https://www.ruby-lang.org/en/
9 
+Group:      System Environment/Security
10 
+Vendor:     VMware, Inc.
11 
+Distribution: Photon
12 
+Source0:    http://mercurial.selenic.com/release/%{name}-%{version}.tar.gz
13 
+%define sha1 mercurial=d5f88e05cbbd8f13dd5fc4004433f54435fc27c8
12 14 
 Patch0:         hg-CVE-2017-9462.patch
13 
-BuildRequires:  python2
14 
-BuildRequires:  python2-libs
15 
-BuildRequires:  python2-devel
16 
-Requires:       python2
15 
+BuildRequires: python2
16 
+BuildRequires: python2-libs
17 
+BuildRequires: python2-devel
18 
+Requires:      python2
19 
+
17 20 
 %description
18 21 
 Mercurial is a distributed source control management tool similar to Git and Bazaar.
19 22 
 Mercurial is written in Python and is used by projects such as Mozilla and Vim.
... ... 
@@ -28,7 +31,7 @@ make build
28 28 
 %install
29 29 
 [ %{buildroot} != "/"] && rm -rf %{buildroot}/*
30 30 
 mkdir -p %{buildroot}/%{_bindir}
31 
-%{__python} setup.py install --skip-build --root %{buildroot}
31 
+python2 setup.py install --skip-build --root %{buildroot}
32 32
33 33 
 cat >> %{buildroot}/.hgrc << "EOF"
34 34 
 [ui]
... ... 
@@ -50,9 +53,11 @@ rm -rf %{buildroot}/*
50 50 
 %defattr(-,root,root)
51 51 
 /.hgrc
52 52 
 %{_bindir}/hg
53 
-%{python_sitelib}/*
53 
+%{python2_sitelib}/*
54 54
55 55 
 %changelog
56 
+*   Fri Jun 16 2017 Dheeraj Shetty <dheerajs@vmware.com> 4.1-3
57 
+-   Use python2 explicitly while building
56 58 
 *   Tue Jun 13 2017 Xiaolin Li <xiaolinl@vmware.com> 4.1-2
57 59 
 -   Apply CVE-2017-9462 patch
58 60 
 *   Fri Mar 31 2017 Michelle Wang <michellew@vmware.com> 4.1-1
SPECS/mesos/mesos.spec
History View file @ ba174b2
... ... 
@@ -1,7 +1,9 @@
1 
+%{!?python2_sitelib: %global python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 
+
1 3 
 Summary:        Mesos
2 4 
 Name:           mesos
3 5 
 Version:        1.2.0
4 
-Release:        2%{?dist}
6 
+Release:        3%{?dist}
5 7 
 License:        Apache
6 8 
 URL:            http://mesos.apache.org
7 9 
 Group:          Applications/System
... ... 
@@ -96,13 +98,15 @@ find %{buildroot}%{_libdir} -name '*.la' -delete
96 96 
 %{_includedir}/*
97 97 
 %{_libdir}/libfixed_resource_estimator*
98 98 
 %{_libdir}/pkgconfig/mesos.pc
99 
-%{_libdir}/python2.7/site-packages/*
99 
+%{python2_sitelib}/*
100 100 
 %{_prefix}/etc/mesos/*
101 101 
 %exclude %{_libdir}/debug/
102 102
103 103 
 %changelog
104 
-*	Thu May 18 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.2.0-2
105 
--	Renamed openjdk to openjdk8
104 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.2.0-3
105 
+-   Use python2_sitelib explicitly
106 
+*   Thu May 18 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.2.0-2
107 
+-   Renamed openjdk to openjdk8
106 108 
 *   Fri Mar 31 2017 Michelle Wang <michellew@vmware.com> 1.2.0-1
107 109 
 -   Update package version
108 110 
 *   Fri Mar 24 2017 Alexey Makhalov <amakhalov@vmware.com> 1.1.0-3
SPECS/paramiko/paramiko.spec
History View file @ ba174b2
... ... 
@@ -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 SSH module
4 4 
 Name:           paramiko
5 5 
 Version:        2.1.2
6 
-Release:        2%{?dist}
6 
+Release:        3%{?dist}
7 7 
 License:        LGPL
8 8 
 Group:          System Environment/Security
9 9 
 Vendor:         VMware, Inc.
... ... 
@@ -48,12 +48,12 @@ Python 3 version.
48 48 
 %setup -q
49 49
50 50 
 %build
51 
-python setup.py build
51 
+python2 setup.py build
52 52 
 python3 setup.py build
53 53
54 54 
 %install
55 55 
 %{__rm} -rf %{buildroot}
56 
-%{__python} setup.py install -O1 --skip-build \
56 
+python2 setup.py install -O1 --skip-build \
57 57 
     --root "%{buildroot}" \
58 58 
     --single-version-externally-managed
59 59
... ... 
@@ -62,7 +62,7 @@ python3 setup.py install -O1 --skip-build \
62 62 
     --single-version-externally-managed
63 63
64 64 
 %check
65 
-%{__python}  test.py
65 
+python2  test.py
66 66 
 python3   test.py
67 67
68 68 
 %clean
... ... 
@@ -71,7 +71,7 @@ python3   test.py
71 71 
 %files
72 72 
 %defattr(-, root, root)
73 73 
 %doc *.txt
74 
-%{python_sitelib}/*
74 
+%{python2_sitelib}/*
75 75
76 76 
 %files -n python3-paramiko
77 77 
 %defattr(-, root, root)
... ... 
@@ -79,6 +79,8 @@ python3   test.py
79 79 
 %{python3_sitelib}/*
80 80
81 81 
 %changelog
82 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 2.1.2-3
83 
+-   Use python2 explicitly while building
82 84 
 *   Fri May 05 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.1.2-2
83 85 
 -   Added missing requires python-cryptography
84 86 
 *   Sat Apr 15 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.1.2-1
SPECS/protobuf/protobuf.spec
History View file @ ba174b2
... ... 
@@ -1,7 +1,10 @@
1 
+%{!?python2_sitelib: %global python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2 
+%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3 
+
1 4 
 Summary:        Google's data interchange format
2 5 
 Name:           protobuf
3 6 
 Version:        3.2.0
4 
-Release:        4%{?dist}
7 
+Release:        5%{?dist}
5 8 
 License:        BSD-3-Clause
6 9 
 Group:          Development/Libraries
7 10 
 Vendor:         VMware, Inc.
... ... 
@@ -85,7 +88,7 @@ autoreconf -iv
85 85 
 %configure --disable-silent-rules
86 86 
 make %{?_smp_mflags}
87 87 
 pushd python
88 
-python setup.py build
88 
+python2 setup.py build
89 89 
 python3 setup.py build
90 90 
 popd
91 91 
 pushd java
... ... 
@@ -95,7 +98,7 @@ popd
95 95 
 %install
96 96 
 make DESTDIR=%{buildroot} install
97 97 
 pushd python
98 
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
98 
+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
99 99 
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
100 100 
 popd
101 101 
 pushd java
... ... 
@@ -133,15 +136,17 @@ popd
133 133 
 %{_libdir}/libprotoc.a
134 134
135 135 
 %files python
136 
-%{_libdir}/python2.7/site-packages/*
136 
+%{python2_sitelib}/*
137 137
138 138 
 %files python3
139 
-%{_libdir}/python3.6/site-packages/*
139 
+%{python3_sitelib}/*
140 140
141 141 
 %files java
142 142 
 %{_libdir}/java/protobuf/*.jar
143 143
144 144 
 %changelog
145 
+*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.2.0-5
146 
+-   Use python2 explicitly while building
145 147 
 *   Thu May 18 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.2.0-4
146 148 
 -   Renamed openjdk to openjdk8
147 149 
 *   Fri Apr 28 2017 Siju Maliakkal <smaliakkal@vmware.com> 3.2.0-3
SPECS/urlgrabber/urlgrabber.spec
History View file @ ba174b2
... ... 
@@ -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
3 3 
 Summary:        A high-level cross-protocol url-grabber
4 4 
 Name:           urlgrabber
5 5 
 Version:        3.10.2
6 
-Release:        3%{?dist}
6 
+Release:        4%{?dist}
7 7 
 License:        LGPLv2+
8 8 
 Group:          Development/Libraries
9 9 
 Vendor:         VMware, Inc.
... ... 
@@ -32,11 +32,11 @@ authentication, proxies and more.
32 32 
 %setup -q -n urlgrabber-%{version}
33 33
34 34 
 %build
35 
-python setup.py build
35 
+python2 setup.py build
36 36
37 37 
 %install
38 38 
 rm -rf $RPM_BUILD_ROOT
39 
-python setup.py install -O1 --root=$RPM_BUILD_ROOT
39 
+python2 setup.py install -O1 --root=$RPM_BUILD_ROOT
40 40 
 rm -rf $RPM_BUILD_ROOT/%{_docdir}/urlgrabber-%{version}
41 41
42 42 
 %check
... ... 
@@ -48,12 +48,14 @@ rm -rf $RPM_BUILD_ROOT
48 48 
 %files
49 49 
 %defattr(-,root,root,-)
50 50 
 %doc ChangeLog LICENSE README TODO
51 
-%{python_sitelib}/urlgrabber*
51 
+%{python2_sitelib}/urlgrabber*
52 52 
 %{_bindir}/urlgrabber
53 53 
 %dir /usr/libexec
54 54 
 %attr(0755,root,root) /usr/libexec/urlgrabber-ext-down
55 55
56 56 
 %changelog
57 
+*   Thu Jun 15 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.10.2-4
58 
+-   Use python2 explicitly to build
57 59 
 *   Tue Jun 05 2017 Chang Lee <changlee@vmware.com> 3.10.2-3
58 60 
 -   Remove thread option in %check
59 61 
 *   Thu May 25 2017 Xiaolin Li <xiaolinl@vmware.com> 3.10.2-2