@@ -1,6 +1,9 @@

+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

+%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

+

 Name:           PyYAML

 Version:        3.12

-Release:        1%{?dist}

+Release:        2%{?dist}

 Summary:        YAML parser and emitter for Python

 Group:          Development/Libraries

 License:        MIT

@@ -8,14 +11,14 @@ URL:            http://pyyaml.org/

 Source0:        http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz

 %define sha1 PyYAML=cb7fd3e58c129494ee86e41baedfec69eb7dafbe

-BuildRequires: python2

-BuildRequires: python2-libs

-BuildRequires: python2-devel

-BuildRequires: libyaml-devel

+BuildRequires:  python2

+BuildRequires:  python2-libs

+BuildRequires:  python2-devel

+BuildRequires:  libyaml-devel

-Requires: python2

-Requires: python2-libs

-Requires: libyaml

+Requires:       python2

+Requires:       python2-libs

+Requires:       libyaml

 %description

 YAML is a data serialization format designed for human readability and

@@ -30,34 +33,68 @@ to represent an arbitrary Python object.

 PyYAML is applicable for a broad range of tasks from complex

 configuration files to object serialization and persistence.

+%package -n     python3-PyYAML

+Summary:        python3-PyYAML

+BuildRequires:  python3

+BuildRequires:  python3-devel

+BuildRequires:  python3-libs

+BuildRequires:  libyaml-devel

+

+Requires:       python3

+Requires:       python3-libs

+Requires:       libyaml

+

+%description -n python3-PyYAML

+Python 3 version.

+

+

 %prep

-%setup -q -n %{name}-%{version}

+%setup -q -n PyYAML-%{version}

+rm -rf ../p3dir

+cp -a . ../p3dir

 %build

-%{__python} setup.py build

-chmod a-x examples/yaml-highlight/yaml_hl.py

+python2 setup.py build

+pushd ../p3dir

+python3 setup.py build

+popd

 %install

 rm -rf $RPM_BUILD_ROOT

 mkdir -p $RPM_BUILD_ROOT/%{_bindir}

-%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT

+python2 setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot}

+chmod a-x examples/yaml-highlight/yaml_hl.py

+pushd ../p3dir

+python3 setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot}

+chmod a-x examples/yaml-highlight/yaml_hl.py

+popd

 %check

-python setup.py test

+python2 setup.py test

+pushd ../p3dir

+python3 setup.py test

+popd

 %clean

 rm -rf $RPM_BUILD_ROOT

 %files

+%defattr(-,root,root)

+%doc PKG-INFO README LICENSE examples

+%{python2_sitelib}/*

+

+%files -n python3-PyYAML

 %defattr(-,root,root,-)

 %doc PKG-INFO README LICENSE examples

-%{python_sitelib}/*

+%{python3_sitelib}/*

 %changelog

-*       Tue Apr 18 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.12-1

--       Updated version to 3.12

-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.11-2

--	GA - Bump release of all rpms

-* Wed Mar 04 2015 Mahmoud Bassiouny <mbassiouny@vmware.com>

-- Initial packaging for Photon

+*   Tue May 16 2017 Kumar Kaushik <kaushikk@vmware.com> 3.12-2

+-   Adding python3 support.

+*   Tue Apr 18 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.12-1

+-   Updated version to 3.12

+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.11-2

+-   GA - Bump release of all rpms

+*   Wed Mar 04 2015 Mahmoud Bassiouny <mbassiouny@vmware.com>

+-   Initial packaging for Photon

@@ -1,6 +1,8 @@

+%define python3_sitelib /usr/lib/python3.6/site-packages

+

 Name:           cloud-init

 Version:        0.7.9

-Release:        3%{?dist}

+Release:        4%{?dist}

 Summary:        Cloud instance init scripts

 Group:          System Environment/Base

 License:        GPLv3

@@ -18,29 +20,27 @@ Patch4:         resizePartitionUUID.patch

 Patch5:         datasource-guestinfo.patch

 Patch6:         systemd-service-changes.patch

-BuildRequires:  python2

-BuildRequires:  python2-libs

-BuildRequires:  python-setuptools

+BuildRequires:  python3

+BuildRequires:  python3-libs

 BuildRequires:  systemd

 BuildRequires:  dbus

-BuildRequires:  python-ipaddr

+BuildRequires:  python3-ipaddr

 BuildRequires:  iproute2

 BuildRequires:  automake

 Requires:       systemd

 Requires:       net-tools

-Requires:       python2

-Requires:       python2-libs

-Requires:       python-configobj

-Requires:       python-prettytable

-Requires:       python-requests

-Requires:       python-setuptools

-Requires:       PyYAML

-Requires:       python-jsonpatch

-Requires:       python-oauthlib

-Requires:       python-jinja2

-Requires:       python-markupsafe

-Requires:       python-six

+Requires:       python3

+Requires:       python3-libs

+Requires:       python3-configobj

+Requires:       python3-prettytable

+Requires:       python3-requests

+Requires:       python3-PyYAML

+Requires:       python3-jsonpatch

+Requires:       python3-oauthlib

+Requires:       python3-jinja2

+Requires:       python3-markupsafe

+Requires:       python3-six

 BuildArch:      noarch

@@ -63,20 +63,21 @@ ssh keys and to let the user run various scripts.

 find systemd -name cloud*.service | xargs sed -i s/StandardOutput=journal+console/StandardOutput=journal/g

 %build

-%{__python} setup.py build

+python3 setup.py build

 %install

 rm -rf $RPM_BUILD_ROOT

-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --init-system systemd

+python3 setup.py install -O1 --skip-build --root=%{buildroot} --init-system systemd

 # Don't ship the tests

-rm -r $RPM_BUILD_ROOT%{python_sitelib}/tests

+rm -r %{buildroot}%{python3_sitelib}/tests

-mkdir -p $RPM_BUILD_ROOT/var/lib/cloud

+mkdir -p %{buildroot}/var/lib/cloud

 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cloud/cloud.cfg.d/

 # We supply our own config file since our software differs from Ubuntu's.

-cp -p %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/cloud/cloud.cfg

+cp -p %{SOURCE1} %{buildroot}/%{_sysconfdir}/cloud/cloud.cfg

+

 # Disable networking config by cloud-init

 cp -p %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/cloud/cloud.cfg.d/

@@ -154,12 +155,14 @@ rm -rf $RPM_BUILD_ROOT

 /lib/systemd/system/*

 %{_docdir}/cloud-init/*

 %{_libdir}/cloud-init/*

-%{python_sitelib}/*

+%{python3_sitelib}/*

 %{_bindir}/cloud-init*

 %dir /var/lib/cloud

 %changelog

+*   Mon May 22 2017 Kumar Kaushik <kaushikk@vmware.com> 0.7.9-4

+-   Making cloud-init to use python3.

 *   Thu May 15 2017 Anish Swaminathan <anishs@vmware.com> 0.7.9-3

 -   Disable networking config by cloud-init

 *   Thu May 04 2017 Anish Swaminathan <anishs@vmware.com> 0.7.9-2

@@ -194,7 +194,7 @@ diff -rupN cloud-init-0.7.9/cloudinit/distros/photon.py cloud-init-0.7.9-new/clo

 +        if not conf:

 +            conf = HostnameConf('')

 +        conf.set_hostname(your_hostname)

-+        util.write_file(out_fn, str(conf), 0644)

++        util.write_file(out_fn, str(conf), mode=0o644)

 +

 +    def _read_system_hostname(self):

 +        sys_hostname = self._read_hostname(self.hostname_conf_fn)

@@ -1,6 +1,9 @@

+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

+%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

+

 Name:           python-configobj

 Version:        5.0.6

-Release:        3%{?dist}

+Release:        4%{?dist}

 Summary:        Config file reading, writing and validation

 License:        BSD

 Group:          Development/Languages/Python

@@ -8,37 +11,67 @@ Url:            https://pypi.python.org/packages/source/c/configobj/configobj-%{

 Source0:        configobj-%{version}.tar.gz

 %define sha1 configobj=add3ae15e3f0d2d28d37370dcad930243cb4145c

-BuildRequires: python2

-BuildRequires: python2-libs

-BuildRequires: python-setuptools

+BuildRequires:  python2

+BuildRequires:  python2-libs

+BuildRequires:  python-setuptools

-Requires: python-six

+Requires:       python-six

 BuildArch:      noarch

 %description

 ConfigObj is a simple but powerful config file reader and writer: an ini file round tripper. Its main feature is that it is very easy to use, with a straightforward programmer’s interface and a simple syntax for config files.

+%package -n     python3-configobj

+Summary:        python-configobj

+

+BuildRequires:  python3

+BuildRequires:  python3-devel

+BuildRequires:  python3-libs

+

+Requires:       python3-six

+

+%description -n python3-configobj

+Python 3 version.

+

 %prep

 %setup -n configobj-%{version}

+rm -rf ../p3dir

+cp -a . ../p3dir

 %build

-python setup.py build

+python2 setup.py build

+pushd ../p3dir

+python3 setup.py build

+popd

 %install

-python setup.py install --prefix=%{_prefix} --root=%{buildroot}

+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}

+pushd ../p3dir

+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}

+popd

 %check

-python validate.py

+python2 validate.py

+pushd ../p3dir

+python3 validate.py

+popd

 %files

 %defattr(-,root,root,-)

-%{python_sitelib}/*

+%{python2_sitelib}/*

+

+

+%files -n python3-configobj

+%defattr(-,root,root)

+%{python3_sitelib}/*

 %changelog

-*       Mon Oct 03 2016 ChangLee <changLee@vmware.com> 5.0.6-3

--       Modified %check

-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 5.0.6-2

--	GA - Bump release of all rpms

-* Wed Mar 04 2015 Mahmoud Bassiouny <mbassiouny@vmware.com>

-- Initial packaging for Photon

+*   Mon May 15 2017 Kumar Kaushik <kaushikk@vmware.com> 5.0.6-4

+-   Adding python 3 support.

+*   Mon Oct 03 2016 ChangLee <changLee@vmware.com> 5.0.6-3

+-   Modified %check

+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 5.0.6-2

+-   GA - Bump release of all rpms

+*   Wed Mar 04 2015 Mahmoud Bassiouny <mbassiouny@vmware.com>

+-   Initial packaging for Photon

new file mode 100755

@@ -0,0 +1,104 @@

+diff -ru ipaddr-2.1.11/ipaddr.py ipaddr-2.1.11-modified/ipaddr.py

+--- ipaddr-2.1.11/ipaddr.py	2014-01-31 13:22:32.000000000 -0800

+@@ -25,6 +25,11 @@

+ __version__ = '2.1.11'

+ 

+ import struct

++import sys

++

++if sys.version_info > (3,):

++    long = int

++    xrange = range

+ 

+ IPV4LENGTH = 32

+ IPV6LENGTH = 128

+@@ -1447,7 +1452,7 @@

+ 

+         try:

+             # Now, parse the hextets into a 128-bit integer.

+-            ip_int = 0L

++            ip_int = long(0)

+             for i in xrange(parts_hi):

+                 ip_int <<= 16

+                 ip_int |= self._parse_hextet(parts[i])

+diff -ru ipaddr-2.1.11/ipaddr_test.py ipaddr-2.1.11-modified/ipaddr_test.py

+--- ipaddr-2.1.11/ipaddr_test.py	2014-01-31 13:02:28.000000000 -0800

+@@ -21,6 +21,11 @@

+ import unittest

+ import time

+ import ipaddr

++import sys

++

++if sys.version_info > (3,):

++    long = int

++

+ 

+ # Compatibility function to cast str to bytes objects

+ if issubclass(ipaddr.Bytes, str):

+@@ -266,7 +271,7 @@

+                          '2001:658:22a:cafe:200::1')

+ 

+     def testGetNetmask(self):

+-        self.assertEqual(int(self.ipv4.netmask), 4294967040L)

++        self.assertEqual(int(self.ipv4.netmask), 4294967040)

+         self.assertEqual(str(self.ipv4.netmask), '255.255.255.0')

+         self.assertEqual(str(self.ipv4_hostmask.netmask), '255.0.0.0')

+         self.assertEqual(int(self.ipv6.netmask),

+@@ -283,7 +288,7 @@

+         self.assertEqual(ipv6_zero_netmask._prefix_from_prefix_string('0'), 0)

+ 

+     def testGetBroadcast(self):

+-        self.assertEqual(int(self.ipv4.broadcast), 16909311L)

++        self.assertEqual(int(self.ipv4.broadcast), 16909311)

+         self.assertEqual(str(self.ipv4.broadcast), '1.2.3.255')

+ 

+         self.assertEqual(int(self.ipv6.broadcast),

+@@ -1100,9 +1105,9 @@

+ 

+     def testNetworkElementCaching(self):

+         # V4 - make sure we're empty

+-        self.assertFalse(self.ipv4._cache.has_key('network'))

+-        self.assertFalse(self.ipv4._cache.has_key('broadcast'))

+-        self.assertFalse(self.ipv4._cache.has_key('hostmask'))

++        self.assertFalse('network' in self.ipv4._cache)

++        self.assertFalse('broadcast' in self.ipv4._cache)

++        self.assertFalse('hostmask' in self.ipv4._cache)

+ 

+         # V4 - populate and test

+         self.assertEqual(self.ipv4.network, ipaddr.IPv4Address('1.2.3.0'))

+@@ -1110,14 +1115,14 @@

+         self.assertEqual(self.ipv4.hostmask, ipaddr.IPv4Address('0.0.0.255'))

+ 

+         # V4 - check we're cached

+-        self.assertTrue(self.ipv4._cache.has_key('network'))

+-        self.assertTrue(self.ipv4._cache.has_key('broadcast'))

+-        self.assertTrue(self.ipv4._cache.has_key('hostmask'))

++        self.assertTrue('network' in self.ipv4._cache)

++        self.assertTrue('broadcast' in self.ipv4._cache)

++        self.assertTrue('hostmask' in self.ipv4._cache)

+ 

+         # V6 - make sure we're empty

+-        self.assertFalse(self.ipv6._cache.has_key('network'))

+-        self.assertFalse(self.ipv6._cache.has_key('broadcast'))

+-        self.assertFalse(self.ipv6._cache.has_key('hostmask'))

++        self.assertFalse('network' in self.ipv6._cache)

++        self.assertFalse('broadcast' in self.ipv6._cache)

++        self.assertFalse('hostmask' in self.ipv6._cache)

+ 

+         # V6 - populate and test

+         self.assertEqual(self.ipv6.network,

+@@ -1128,9 +1133,9 @@

+                          ipaddr.IPv6Address('::ffff:ffff:ffff:ffff'))

+ 

+         # V6 - check we're cached

+-        self.assertTrue(self.ipv6._cache.has_key('network'))

+-        self.assertTrue(self.ipv6._cache.has_key('broadcast'))

+-        self.assertTrue(self.ipv6._cache.has_key('hostmask'))

++        self.assertTrue('network' in self.ipv6._cache)

++        self.assertTrue('broadcast' in self.ipv6._cache)

++        self.assertTrue('hostmask' in self.ipv6._cache)

+ 

+     def testTeredo(self):

+         # stolen from wikipedia

@@ -1,45 +1,79 @@

+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

+%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

+

 Name:           python-ipaddr

 Version:        2.1.11

-Release:        3%{?dist}

+Release:        4%{?dist}

 Url:            https://github.com/google/ipaddr-py

 Summary:        Google's Python IP address manipulation library

 License:        Apache2

 Group:          Development/Languages/Python

 Source0:        https://pypi.python.org/packages/source/i/ipaddr/ipaddr-%{version}.tar.gz

 %define sha1 ipaddr=f9a16ddb3cf774b8dcf8894c2f4295c4e17d0ed3

+Patch0:         ipaddr-python3-compatibility.patch

-BuildRequires: python2

-BuildRequires: python2-libs

-BuildRequires: python-setuptools

+BuildRequires:  python2

+BuildRequires:  python2-libs

+BuildRequires:  python-setuptools

 Requires:       python2

-Requires:		python2-libs

+Requires:	python2-libs

 BuildArch:      noarch

 %description

 ipaddr.py is a library for working with IP addresses, both IPv4 and IPv6. It was developed by Google for internal use, and is now open source.

+%package -n     python3-ipaddr

+Summary:        python-ipaddr

+BuildRequires:  python3

+BuildRequires:  python3-devel

+BuildRequires:  python3-libs

+

+Requires:       python3

+Requires:       python3-libs

+

+%description -n python3-ipaddr

+Python 3 version.

+

 %prep

 %setup -q -n ipaddr-%{version}

+%patch0 -p1

+rm -rf ../p3dir

+cp -a . ../p3dir

 %build

-python setup.py build

+python2 setup.py build

+pushd ../p3dir

+python3 setup.py build

+popd

 %install

-python setup.py install --prefix=%{_prefix} --root=%{buildroot}

+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}

+pushd ../p3dir

+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}

+popd

 %check

-python ipaddr_test.py

+python2 ipaddr_test.py

+pushd ../p3dir

+python3 ipaddr_test.py

+popd

 %files

 %defattr(-,root,root)

-%{python_sitelib}/*

+%{python2_sitelib}/*

+

+%files -n python3-ipaddr

+%defattr(-,root,root,-)

+%{python3_sitelib}/*

 %changelog

-*       Mon Oct 03 2016 ChangLee <changLee@vmware.com> 2.1.11-3

--       Modified %check

-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.1.11-2

--	GA - Bump release of all rpms

-* Tue Oct 27 2015 Mahmoud Bassiouny <mbassiouny@vmware.com>

-- Initial packaging for Photon

+*   Tue May 16 2017 Kumar Kaushik <kaushikk@vmware.com> 2.1.11-4

+-   Adding python 3 support.

+*   Mon Oct 03 2016 ChangLee <changLee@vmware.com> 2.1.11-3

+-   Modified %check

+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.1.11-2

+-   GA - Bump release of all rpms

+*   Tue Oct 27 2015 Mahmoud Bassiouny <mbassiouny@vmware.com>

+-   Initial packaging for Photon

@@ -1,6 +1,9 @@

+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

+%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

+

 Name:           python-prettytable

 Version:        0.7.2

-Release:        3%{?dist}

+Release:        4%{?dist}

 Summary:        Library for displaying tabular data in a visually appealing ASCII format

 License:        BSD-2-Clause

 Group:          Development/Languages/Python

@@ -8,12 +11,12 @@ Url:            http://code.google.com/p/prettytable/

 Source0:        prettytable-%{version}.tar.gz

 %define sha1 prettytable=b7d0bf0feee0d23108a044ffae44aff5c5935250

-BuildRequires: python2

-BuildRequires: python2-libs

-BuildRequires: python-setuptools

+BuildRequires:  python2

+BuildRequires:  python2-libs

+BuildRequires:  python-setuptools

-Requires: python2

-Requires: python2-libs

+Requires:       python2

+Requires:       python2-libs

 BuildArch:      noarch

@@ -25,26 +28,58 @@ selection of which columns are to be printed, independent alignment of columns

 (left or right justified or centred) and printing of "sub-tables" by

 specifying a row range.

+

+%package -n     python3-prettytable

+Summary:        python-prettytable

+

+BuildRequires:  python3

+BuildRequires:  python3-devel

+BuildRequires:  python3-libs

+

+Requires:       python3

+Requires:       python3-libs

+

+%description -n python3-prettytable

+Python 3 version.

+

 %prep

 %setup -n prettytable-%{version}

+rm -rf ../p3dir

+cp -a . ../p3dir

 %build

-python setup.py build

+python2 setup.py build

+pushd ../p3dir

+python3 setup.py build

+popd

 %install

-python setup.py install --prefix=%{_prefix} --root=%{buildroot}

+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}

+pushd ../p3dir

+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}

+popd

 %check

-python prettytable_test.py

+python2 prettytable_test.py

+pushd ../p3dir

+python3 prettytable_test.py

+popd

 %files

+%defattr(-,root,root)

+%{python2_sitelib}/*

+

+%files -n python3-prettytable

 %defattr(-,root,root,-)

-%{python_sitelib}/*

+%{python3_sitelib}/*

+

 %changelog

-*       Mon Oct 04 2016 ChangLee <changlee@vmware.com> 0.7.2-3

--       Modified %check

-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.7.2-2

--	GA - Bump release of all rpms

-* Wed Mar 04 2015 Mahmoud Bassiouny <mbassiouny@vmware.com>

-- Initial packaging for Photon

+*   Tue May 16 2017 Kumar Kaushik <kaushikk@vmware.com> 0.7.2-4

+-   Adding python3 support.

+*   Mon Oct 04 2016 ChangLee <changlee@vmware.com> 0.7.2-3

+-   Modified %check

+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.7.2-2

+-   GA - Bump release of all rpms

+*   Wed Mar 04 2015 Mahmoud Bassiouny <mbassiouny@vmware.com>

+-   Initial packaging for Photon