@@ -1,7 +1,7 @@

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

 Name:           apparmor

 Version:        2.13

-Release:        4%{?dist}

+Release:        5%{?dist}

 Summary:        AppArmor is an effective and easy-to-use Linux application security system.

 License:        GNU LGPL v2.1

 URL:            https://launchpad.net/apparmor

@@ -156,9 +156,9 @@ This package contains the AppArmor module for perl.

 %patch1 -p1

 %build

-export PYTHONPATH=/usr/lib/python3.6/site-packages

+export PYTHONPATH=/usr/lib/python3.7/site-packages

 export PYTHON=/usr/bin/python3

-export PYTHON_VERSION=3.6

+export PYTHON_VERSION=3.7

 export PYTHON_VERSIONS=python3

 #Building libapparmor

 cd ./libraries/libapparmor

@@ -203,9 +203,9 @@ make check -C pam_apparmor

 make check -C profiles

 %install

-export PYTHONPATH=/usr/lib/python3.6/site-packages

+export PYTHONPATH=/usr/lib/python3.7/site-packages

 export PYTHON=/usr/bin/python3

-export PYTHON_VERSION=3.6

+export PYTHON_VERSION=3.7

 export PYTHON_VERSIONS=python3

 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/"

 cd libraries/libapparmor

@@ -343,6 +343,8 @@ make DESTDIR=%{buildroot} install

 %{perl_archlib}/perllocal.pod

 %changelog

+*   Fri Oct 05 2018 Tapas Kundu <tkundu@vmware.com> 2.13-5

+-   Updated using python 3.7 libs

 *   Wed Oct 03 2018 Keerthana K <keerthanak@vmware.com> 2.13-4

 -   Depcrecated ruby apparmor package.

 -   Modified the perl and python path to generic.

@@ -1,12 +1,14 @@

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

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

 Name:           cloud-init

 Version:        0.7.9

-Release:        14%{?dist}

+Release:        15%{?dist}

 Summary:        Cloud instance init scripts

 Group:          System Environment/Base

 License:        GPLv3

 URL:            http://launchpad.net/cloud-init

+Vendor:         VMware, Inc

+Distribution:   Photon

 Source0:        https://launchpad.net/cloud-init/trunk/%{version}/+download/%{name}-%{version}.tar.gz

 %define sha1 cloud-init=3b4345267e72e28b877e2e3f0735c1f672674cfc

 Source1:        cloud-photon.cfg

@@ -138,6 +140,8 @@ rm -rf $RPM_BUILD_ROOT

 %changelog

+*   Sun Oct 07 2018 Tapas Kundu <tkundu@vmware.com> 0.7.9-15

+-   Updated using python 3.7 lib

 *   Wed Feb 28 2018 Anish Swaminathan <anishs@vmware.com> 0.7.9-14

 -   Add support for systemd constructs for azure DS

 *   Mon Oct 16 2017 Vinay Kulkarni <kulakrniv@vmware.com> 0.7.9-13

@@ -160,7 +164,7 @@ rm -rf $RPM_BUILD_ROOT

 -   Enable OVF datasource by default

 *   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

+*   Mon 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

 -   Support userdata in vmx guestinfo

@@ -182,7 +186,7 @@ rm -rf $RPM_BUILD_ROOT

 *   Mon Oct 24 2016 Divya Thaluru <dthaluru@vmware.com>  0.7.6-11

 -   Enabled ssh module in cloud-init

 *   Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com>  0.7.6-10

--   Fixed logic to restart the active services after upgrade 

+-   Fixed logic to restart the active services after upgrade

 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.7.6-9

 -   GA - Bump release of all rpms

 *   Tue May 3 2016 Divya Thaluru <dthaluru@vmware.com>  0.7.6-8

@@ -4,12 +4,12 @@

 Summary:        Lightweight in-process concurrent programming

 Name:           python-greenlet

 Version:        0.4.15

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        MIT

 Group:          Development/Languages/Python

 Vendor:         VMware, Inc.

 Distribution:   Photon

-Url:            https://pypi.python.org/pypi/greenlet

+URL:            https://pypi.python.org/pypi/greenlet

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

 %define sha1    greenlet=0da9c069c38bf297923a1da0c601ef71c07ffb6d

@@ -18,6 +18,9 @@ BuildRequires:  python2-libs

 BuildRequires:  python-setuptools

 BuildRequires:  python2-devel

+BuildRequires:  python3

+BuildRequires:  python3-devel

+BuildRequires:  python3-libs

 Requires:       python2

 Requires:       python2-libs

@@ -28,9 +31,6 @@ A “greenlet”, on the other hand, is a still more primitive notion of micro-t

 %package -n     python3-greenlet

 Summary:        python-greenlet

-BuildRequires:  python3

-BuildRequires:  python3-devel

-BuildRequires:  python3-libs

 Requires:       python3

 Requires:       python3-libs

@@ -61,9 +61,12 @@ python2 setup.py test

 %files -n python3-greenlet

 %defattr(-,root,root,-)

 %{python3_sitelib}/*

-/usr/include/python3.6m/greenlet/greenlet.h

+/usr/include/python3.7m/greenlet/greenlet.h

 %changelog

+*   Fri Oct 05 2018 Tapas Kundu <tkundu@vmware.com> 0.4.15-2

+-   Updated using python 3.7

+-   removed buildrequires from subpackages

 *   Sun Sep 09 2018 Tapas Kundu <tkundu@vmware.com> 0.4.15-1

 -   Update to version 0.4.15

 *   Fri Aug 11 2017 Rongrong Qiu <rqiu@vmware.com> 0.4.12-3

@@ -1,24 +1,25 @@

 Summary:        A high-level scripting language

 Name:           python3

-Version:        3.6.1

-Release:        9%{?dist}

+Version:        3.7.0

+Release:        1%{?dist}

 License:        PSF

 URL:            http://www.python.org/

 Group:          System Environment/Programming

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        https://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz

-%define sha1    Python=91d880a2a9fcfc6753cbfa132bf47a47e17e7b16

+%define sha1    Python=653cffa5b9f2a28150afe4705600d2e55d89b564

 Patch0:         cgi3.patch

 Patch1:         python3-support-photon-platform.patch

-#https://github.com/python/cpython/pull/1320/commits/a252330d53afad6f8a4645933989bb017dc35ad8

-Patch2:         skip-imaplib-test.patch

 BuildRequires:  pkg-config >= 0.28

 BuildRequires:  bzip2-devel

 BuildRequires:  ncurses-devel

 BuildRequires:  openssl-devel

 BuildRequires:  readline-devel

 BuildRequires:  xz-devel

+BuildRequires:  expat-devel >= 2.1.0

+BuildRequires:  libffi-devel >= 3.0.13

+BuildRequires:  sqlite-devel

 Requires:       ncurses

 Requires:       openssl

 Requires:       python3-libs = %{version}-%{release}

@@ -39,10 +40,6 @@ code. It is incompatible with Python 2.x releases.

 %package libs

 Summary: The libraries for python runtime

 Group: Applications/System

-BuildRequires:  expat-devel >= 2.1.0

-BuildRequires:  libffi-devel >= 3.0.13

-BuildRequires:  ncurses-devel

-BuildRequires:  sqlite-devel

 Requires:       (coreutils or toybox)

 Requires:       expat >= 2.1.0

 Requires:       libffi >= 3.0.13

@@ -134,16 +131,12 @@ The test package contains all regression tests for Python as well as the modules

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

 %patch0 -p1

 %patch1 -p1

-%patch2 -p1

 %build

 export OPT="${CFLAGS}"

-./configure \

+%configure \

     CFLAGS="%{optflags}" \

     CXXFLAGS="%{optflags}" \

-    --prefix=%{_prefix} \

-    --bindir=%{_bindir} \

-    --libdir=%{_libdir} \

     --enable-shared \

     --with-system-expat \

     --with-system-ffi \

@@ -153,9 +146,9 @@ make %{?_smp_mflags}

 %install

 [ %{buildroot} != "/"] && rm -rf %{buildroot}/*

 make DESTDIR=%{buildroot} install

-chmod -v 755 %{buildroot}%{_libdir}/libpython3.6m.so.1.0

+chmod -v 755 %{buildroot}%{_libdir}/libpython3.7m.so.1.0

 %{_fixperms} %{buildroot}/*

-ln -sf libpython3.6m.so %{buildroot}%{_libdir}/libpython3.6.so

+ln -sf libpython3.7m.so %{buildroot}%{_libdir}/libpython3.7.so

 # Remove unused stuff

 find %{buildroot}%{_libdir} -name '*.pyc' -delete

@@ -178,61 +171,61 @@ rm -rf %{buildroot}/*

 %{_bindir}/pydoc*

 %{_bindir}/pyvenv*

 %{_bindir}/python3

-%{_bindir}/python3.6

-%{_bindir}/python3.6m

+%{_bindir}/python3.7

+%{_bindir}/python3.7m

 %{_mandir}/*/*

-%dir %{_libdir}/python3.6

-%dir %{_libdir}/python3.6/site-packages

+%dir %{_libdir}/python3.7

+%dir %{_libdir}/python3.7/site-packages

 %{_libdir}/libpython3.so

-%{_libdir}/libpython3.6.so

-%{_libdir}/libpython3.6m.so.1.0

+%{_libdir}/libpython3.7.so

+%{_libdir}/libpython3.7m.so.1.0

-%exclude %{_libdir}/python3.6/ctypes/test

-%exclude %{_libdir}/python3.6/distutils/tests

-%exclude %{_libdir}/python3.6/sqlite3/test

-%exclude %{_libdir}/python3.6/idlelib/idle_test

-%exclude %{_libdir}/python3.6/test

-%exclude %{_libdir}/python3.6/lib-dynload/_ctypes_test.*.so

+%exclude %{_libdir}/python3.7/ctypes/test

+%exclude %{_libdir}/python3.7/distutils/tests

+%exclude %{_libdir}/python3.7/sqlite3/test

+%exclude %{_libdir}/python3.7/idlelib/idle_test

+%exclude %{_libdir}/python3.7/test

+%exclude %{_libdir}/python3.7/lib-dynload/_ctypes_test.*.so

 %files libs

 %defattr(-,root,root)

 %doc LICENSE README.rst

-%{_libdir}/python3.6

-%{_libdir}/python3.6/site-packages/easy_install.py

-%{_libdir}/python3.6/site-packages/README.txt

-%exclude %{_libdir}/python3.6/site-packages/

-%exclude %{_libdir}/python3.6/ctypes/test

-%exclude %{_libdir}/python3.6/distutils/tests

-%exclude %{_libdir}/python3.6/sqlite3/test

-%exclude %{_libdir}/python3.6/idlelib/idle_test

-%exclude %{_libdir}/python3.6/test

-%exclude %{_libdir}/python3.6/lib-dynload/_ctypes_test.*.so

-%exclude %{_libdir}/python3.6/xml

-%exclude %{_libdir}/python3.6/lib-dynload/pyexpat*.so

-%exclude %{_libdir}/python3.6/curses

-%exclude %{_libdir}/python3.6/lib-dynload/_curses*.so

+%{_libdir}/python3.7

+%{_libdir}/python3.7/site-packages/easy_install.py

+%{_libdir}/python3.7/site-packages/README.txt

+%exclude %{_libdir}/python3.7/site-packages/

+%exclude %{_libdir}/python3.7/ctypes/test

+%exclude %{_libdir}/python3.7/distutils/tests

+%exclude %{_libdir}/python3.7/sqlite3/test

+%exclude %{_libdir}/python3.7/idlelib/idle_test

+%exclude %{_libdir}/python3.7/test

+%exclude %{_libdir}/python3.7/lib-dynload/_ctypes_test.*.so

+%exclude %{_libdir}/python3.7/xml

+%exclude %{_libdir}/python3.7/lib-dynload/pyexpat*.so

+%exclude %{_libdir}/python3.7/curses

+%exclude %{_libdir}/python3.7/lib-dynload/_curses*.so

 %files  xml

-%{_libdir}/python3.6/xml/*

-%{_libdir}/python3.6/lib-dynload/pyexpat*.so

+%{_libdir}/python3.7/xml/*

+%{_libdir}/python3.7/lib-dynload/pyexpat*.so

 %files  curses

-%{_libdir}/python3.6/curses/*

-%{_libdir}/python3.6/lib-dynload/_curses*.so

+%{_libdir}/python3.7/curses/*

+%{_libdir}/python3.7/lib-dynload/_curses*.so

 %files devel

 %defattr(-,root,root)

 %{_includedir}/*

-%{_libdir}/pkgconfig/python-3.6.pc

-%{_libdir}/pkgconfig/python-3.6m.pc

+%{_libdir}/pkgconfig/python-3.7.pc

+%{_libdir}/pkgconfig/python-3.7m.pc

 %{_libdir}/pkgconfig/python3.pc

-%{_libdir}/libpython3.6m.so

+%{_libdir}/libpython3.7m.so

 %{_bindir}/python3-config

-%{_bindir}/python3.6-config

-%{_bindir}/python3.6m-config

+%{_bindir}/python3.7-config

+%{_bindir}/python3.7m-config

 %doc Misc/README.valgrind Misc/valgrind-python.supp Misc/gdbinit

 %{_libdir}/libpython3.so

@@ -242,27 +235,29 @@ rm -rf %{buildroot}/*

 %files tools

 %defattr(-,root,root,755)

 %doc Tools/README

-%{_libdir}/python3.6/lib2to3

-%{_bindir}/2to3-3.6

+%{_libdir}/python3.7/lib2to3

+%{_bindir}/2to3-3.7

 %exclude %{_bindir}/idle*

 %files pip

 %defattr(-,root,root,755)

-%{_libdir}/python3.6/site-packages/pip/*

-%{_libdir}/python3.6/site-packages/pip-9.0.1.dist-info/*

+%{_libdir}/python3.7/site-packages/pip/*

+%{_libdir}/python3.7/site-packages/pip-10.0.1.dist-info/*

 %{_bindir}/pip*

 %files setuptools

 %defattr(-,root,root,755)

-%{_libdir}/python3.6/site-packages/pkg_resources/*

-%{_libdir}/python3.6/site-packages/setuptools/*

-%{_libdir}/python3.6/site-packages/setuptools-28.8.0.dist-info/*

-%{_bindir}/easy_install-3.6

+%{_libdir}/python3.7/site-packages/pkg_resources/*

+%{_libdir}/python3.7/site-packages/setuptools/*

+%{_libdir}/python3.7/site-packages/setuptools-39.0.1.dist-info/*

+%{_bindir}/easy_install-3.7

 %files test

-%{_libdir}/python3.6/test/*

+%{_libdir}/python3.7/test/*

 %changelog

+*   Wed Sep 26 2018 Tapas Kundu <tkundu@vmware.com> 3.7.0-1

+-   Updated to version 3.7.0

 *   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 3.6.1-9

 -   Requires coreutils or toybox

 -   Requires bzip2-libs

deleted file mode 100644

@@ -1,35 +0,0 @@

-From a252330d53afad6f8a4645933989bb017dc35ad8 Mon Sep 17 00:00:00 2001

-From: Victor Stinner <victor.stinner@gmail.com>

-Date: Thu, 27 Apr 2017 16:08:24 +0200

-Subject: [PATCH] bpo-30175: Skip client cert tests of test_imaplib

-

-The IMAP server cyrus.andrew.cmu.edu doesn't accept our randomly

-generated client x509 certificate anymore.

- Lib/test/test_imaplib.py | 6 ++++++

- 1 file changed, 6 insertions(+)

-

-diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py

-index 5ef9512c3f5..a33fb714fe7 100644

-+++ b/Lib/test/test_imaplib.py

-@@ -965,6 +965,9 @@ def test_logincapa(self):

-             _server = self.imap_class(self.host, self.port)

-             self.check_logincapa(_server)

- 

-+    @unittest.skipIf(True,

-+                     "bpo-30175: FIXME: cyrus.andrew.cmu.edu doesn't accept "

-+                     "our randomly generated client x509 certificate anymore")

-     def test_logincapa_with_client_certfile(self):

-         with transient_internet(self.host):

-             with support.check_warnings(('', DeprecationWarning)):

-@@ -972,6 +975,9 @@ def test_logincapa_with_client_certfile(self):

-                                           certfile=CERTFILE)

-                 self.check_logincapa(_server)

- 

-+    @unittest.skipIf(True,

-+                     "bpo-30175: FIXME: cyrus.andrew.cmu.edu doesn't accept "

-+                     "our randomly generated client x509 certificate anymore")

-     def test_logincapa_with_client_ssl_context(self):

-         with transient_internet(self.host):

-             _server = self.imap_class(