@@ -548,8 +548,7 @@ install-photon-docker-image: photon-docker-image

 # Spec file checker and utilities

 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

 check-spec-files:

-	@echo ""

-	@./tools/scripts/check_spec_files.sh $(BASE_COMMIT)

+	@./tools/scripts/check_spec_files.sh

 generate-dep-lists:

 	@echo ""

@@ -5,7 +5,7 @@

 Summary:        Python bindings for PAM (Pluggable Authentication Modules).

 Name:           PyPAM

 Version:        0.5.0

-Release:        3%{?dist}

+Release:        4%{?dist}

 License:        LGPLv2

 Group:          Development/Languages/Python

 Vendor:         VMware, Inc.

@@ -21,10 +21,13 @@ Patch3:         PyPAM-0.5.0-memory-errors.patch

 Patch4:         PyPAM-0.5.0-return-value.patch

 Patch5:         PyPAM-python3-support.patch

-BuildRequires:  python2

+BuildRequires:  python2-devel

 BuildRequires:  python2-libs

 BuildRequires:  python-setuptools

 BuildRequires:  Linux-PAM-devel

+BuildRequires:  python3

+BuildRequires:  python3-devel

+BuildRequires:  python3-libs

 Requires:       python2

 Requires:       python2-libs

@@ -34,9 +37,6 @@ Python bindings for PAM (Pluggable Authentication Modules).

 %package -n     python3-PyPAM

 Summary:        python-PyPAM

-BuildRequires:  python3

-BuildRequires:  python3-devel

-BuildRequires:  python3-libs

 Requires:       python3

 Requires:       python3-libs

@@ -85,6 +85,9 @@ popd

 %{python3_sitelib}/*

 %changelog

+*   Thu Jan 10 2019 Alexey Makhalov <amakhalov@vmware.com> 0.5.0-4

+-   Added BuildRequires python2-devel.

+-   Moved all buildRequires to the main package.

 *   Thu Jun 22 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.5.0-3

 -   Fix the check section

 *   Wed May 31 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.5.0-2

@@ -2,7 +2,7 @@

 Summary:        A version control system

 Name:           bzr

 Version:        2.7.0

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        GPLv2+

 URL:            http://www.bazaar-vcs.org/

 Group:          System Environment/Security

@@ -10,6 +10,7 @@ Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        https://launchpad.net/bzr/2.7/2.7.0/+download/bzr-2.7.0.tar.gz

 %define sha1    bzr=872f6088f8b07558519dbbc88fffa05e37602f52

+BuildRequires:  python2-devel

 %description

 Bazaar is a version control system that helps you track project history over time and to collaborate easily with others. Whether you're a single developer, a co-located team or a community of developers scattered across the world, Bazaar scales and adapts to meet your needs. Part of the GNU Project, Bazaar is free software sponsored by Canonical. For a closer look, see ten reasons to switch to Bazaar.

@@ -34,5 +35,7 @@ python2 setup.py check

 %{_mandir}/man1/*

 %changelog

+*   Tue Jan 08 2019 Alexey Makhalov <amakhalov@vmware.com> 2.7.0-2

+-   Added BuildRequires python2-devel

 *   Thu Jun 22 2017 Xiaolin Li <xiaolinl@vmware.com> 2.7.0-1

 -   Initial build. First version

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

 Summary:        Fast distributed version control system

 Name:           git

 Version:        2.19.0

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        GPLv2

 URL:            http://git-scm.com/

 Group:          System Environment/Programming

@@ -19,6 +19,7 @@ Requires:       perl-YAML

 Requires:       perl-DBI

 Requires:       perl-CGI

 Requires:       subversion-perl

+Requires:       python2

 %description

 Git is a free and open source, distributed version control system

@@ -89,6 +90,8 @@ rm -rf %{buildroot}/*

 %defattr(-,root,root)

 %changelog

+*   Thu Jan 10 2019 Alexey Makhalov <amakhalov@vmware.com> 2.19.0-3

+-   Added Requires python2

 *   Thu Oct 04 2018 Dweep Advani <dadvani@vmware.com> 2.19.0-2

 -   Using %configure and changing for perl upgrade

 *   Tue Oct 02 2018 Siju Maliakkal <smaliakkal@vmware.com> 2.19.0-1

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

 Summary:       Mozilla's JavaScript engine.

 Name:          js

 Version:       1.8.5

-Release:       2%{?dist}

+Release:       3%{?dist}

 Group:         Applications/System

 Vendor:        VMware, Inc.

 License:       GPLv2+ or LGPLv2+ or MPLv1.1

@@ -13,13 +13,14 @@ BuildRequires: autoconf

 BuildRequires: ncurses-devel

 BuildRequires: nspr-devel >= 4.7

 BuildRequires: zip

+BuildRequires: python2

 Requires:      ncurses

 Requires:      nspr

 %define sha1 js185=52a01449c48d7a117b35f213d3e4263578d846d6

 %description

 Mozilla's JavaScript engine includes a just-in-time compiler (JIT) that compiles

-JavaScript to machine code, for a significant speed increase. 

+JavaScript to machine code, for a significant speed increase.

 %package devel

 Summary:        js devel

@@ -69,6 +70,8 @@ find %{buildroot} -name '*.la' -delete

 %{_libdir}/pkgconfig/mozjs185.pc

 %changelog

+*   Tue Jan 08 2019 Alexey Makhalov <amakhalov@vmware.com> 1.8.5-3

+-   Added BuildRequires python2

 *   Tue Nov 14 2017 Alexey Makhalov <amakhalov@vmware.com> 1.8.5-2

 -   Aarch64 support

 *   Thu Oct 05 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.8.5-1

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

 Summary:    libpsl - C library to handle the Public Suffix List

 Name:       libpsl

 Version:    0.20.2

-Release:    1%{?dist}

+Release:    2%{?dist}

 License:    MIT

 URL:        https://github.com/rockdaboot/libpsl

 Group:      System Environment/Development

@@ -11,6 +11,7 @@ Source0:    https://github.com/rockdaboot/libpsl/releases/download/%{name}-%{ver

 %define sha1 libpsl=890376d6038652911cfa853ccfb5b993ae0743ee

 BuildRequires: icu-devel

+BuildRequires: python2

 Requires:      icu

 %description

@@ -92,5 +93,7 @@ make check

 %{_libdir}/pkgconfig/*

 %changelog

+*   Tue Jan 08 2019 Alexey Makhalov <amakhalov@vmware.com> 0.20.2-2

+-   Added BuildRequires python2

 *   Mon Sep 17 2018 Bo Gan <ganb@vmware.com> 0.20.2-1

 -   Initial packaging of libpsl

@@ -3,7 +3,7 @@

 Summary:        SELinux library and simple utilities

 Name:           libselinux

 Version:        2.8

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        Public Domain

 Group:          System Environment/Libraries

 Source0:        https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160107/%{name}-%{version}.tar.gz

@@ -13,6 +13,7 @@ Vendor:         VMware, Inc.

 Distribution:   Photon

 BuildRequires:  libsepol-devel

 BuildRequires:  pcre-devel, swig

+BuildRequires:  python2-devel

 BuildRequires:  python3-devel

 Requires:       pcre-libs

 Requires:       libsepol

@@ -35,7 +36,7 @@ decisions.  Required for any applications that use the SELinux API.

 %package        utils

 Summary:        SELinux libselinux utilies

 Group:          Development/Libraries

-Requires:       libselinux = %{version}-%{release} 

+Requires:       libselinux = %{version}-%{release}

 %description    utils

 The libselinux-utils package contains the utilities

@@ -50,7 +51,7 @@ Provides:       pkgconfig(libselinux)

 %description    devel

 The libselinux-devel package contains the libraries and header files

-needed for developing SELinux applications. 

+needed for developing SELinux applications.

 %package        python

 Summary:        SELinux python2 bindings for libselinux

@@ -130,6 +131,8 @@ rm -rf %{buildroot}

 %{python3_sitelib}/*

 %changelog

+*   Tue Jan 08 2019 Alexey Makhalov <amakhalov@vmware.com> 2.8-2

+-   Added BuildRequires python2-devel

 *   Fri Aug 10 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 2.8-1

 -   Update to version 2.8 to get it to build with gcc 7.3

 *   Thu Aug 24 2017 Alexey Makhalov <amakhalov@vmware.com> 2.6-4

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

 Summary:    Talloc is a hierarchical, reference counted memory pool system

 Name:       libtalloc

 Version:    2.1.14

-Release:    1%{?dist}

+Release:    2%{?dist}

 License:    LGPLv3+

 URL:        https://talloc.samba.org

 Group:      System Environment/Libraries

@@ -11,6 +11,7 @@ Source0:    https://www.samba.org/ftp/talloc/talloc-%{version}.tar.gz

 %define sha1 talloc=9d563b768148b620bdae1c97b36cfc30928a1044

 BuildRequires: libxslt

 BuildRequires: docbook-xsl

+BuildRequires: python2-devel

 %description

 Libtalloc alloc is a hierarchical, reference counted memory pool system with destructors. It is the core memory allocator used in Samba.

@@ -77,6 +78,8 @@ make check

 %{_libdir}/libpytalloc-util.so

 %changelog

+*   Tue Jan 08 2019 Alexey Makhalov <amakhalov@vmware.com> 2.1.14-2

+-   Added BuildRequires python2-devel

 *   Tue Sep 11 2018 Bo Gan <ganb@vmware.com> 2.1.14-1

 -   Update to 2.1.14

 *   Thu Aug 03 2017 Chang Lee <changlee@vmware.com> 2.1.9-2

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

 Summary:        A collection of modular and reusable compiler and toolchain technologies.

 Name:           llvm

 Version:        6.0.1

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        NCSA

 URL:            http://lldb.llvm.org

 Group:          Development/Tools

@@ -12,6 +12,7 @@ Source0:        http://releases.llvm.org/%{version}/%{name}-%{version}.src.tar.x

 BuildRequires:  cmake

 BuildRequires:  libxml2-devel

 BuildRequires:  libffi-devel

+BuildRequires:  python2

 Requires:       libxml2

 %description

@@ -77,6 +78,8 @@ rm -rf %{buildroot}/*

 %{_includedir}/*

 %changelog

+*   Tue Jan 08 2019 Alexey Makhalov <amakhalov@vmware.com> 6.0.1-2

+-   Added BuildRequires python2

 *   Thu Aug 09 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 6.0.1-1

 -   Update to version 6.0.1 to get it to build with gcc 7.3

 *   Thu Aug 10 2017 Alexey Makhalov <amakhalov@vmware.com> 4.0.0-3

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

 Summary:    Modular initramfs image creation utility

 Name:       mkinitcpio

 Version:    24

-Release:    1%{?dist}

+Release:    2%{?dist}

 License:    GPLv2

 URL:        https://projects.archlinux.org/mkinitcpio.git/

 Group:      System Environment/Development

@@ -11,7 +11,7 @@ Source0:    https://projects.archlinux.org/mkinitcpio.git/snapshot/%{name}-%{ver

 %define sha1 mkinitcpio=416789532960f7deecb4d5734a398da2437bbb58

 Patch0:     mkinitcpio-shutdown-ramfs.service.patch

 BuildRequires: asciidoc

-BuildRequires: python2-libs

+BuildRequires: python2

 BuildRequires: python-xml

 BuildRequires: docbook-xsl

 BuildRequires: libxml2-devel

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

 /usr/share/*

 %changelog

+*   Fri Jan 18 2019 Alexey Makhalov <amakhalov@vmware.com> 24-2

+-   Added buildRequires python2.

 *   Mon Sep 10 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 24-1

 -   Update to version 24

 *   Fri May 05 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 23-3

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

 Summary:        A JavaScript runtime built on Chrome's V8 JavaScript engine.

 Name:           nodejs

 Version:        8.11.4

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        MIT

 Group:          Applications/System

 Vendor:         VMware, Inc.

@@ -11,8 +11,11 @@ Source0:        https://nodejs.org/download/release/v8.3.0/node-v%{version}.tar.

 %define         sha1 node=195b6e6b53d04659cd6ee6afa203ad486d6eb758

 BuildRequires:  coreutils >= 8.22, openssl-devel >= 1.0.1

+BuildRequires:  python2

+BuildRequires:  which

 Requires:       (coreutils >= 8.22 or toybox)

 Requires:       openssl >= 1.0.1

+Requires:       python2

 %description

 Node.js is a JavaScript runtime built on Chrome's V8 JavaScript engine. Node.js uses an event-driven, non-blocking I/O model that makes it lightweight and efficient. The Node.js package ecosystem, npm, is the largest ecosystem of open source libraries in the world.

@@ -30,7 +33,7 @@ for developing applications that use nodejs.

 %setup -q -n node-v%{version}

 %build

-./configure --prefix=%{_prefix} \

+sh configure --prefix=%{_prefix} \

            --shared-openssl \

            --shared-zlib

@@ -70,6 +73,8 @@ make cctest

 %{_datadir}/systemtap/tapset/node.stp

 %changelog

+*   Tue Jan 08 2019 Alexey Makhalov <amakhalov@vmware.com> 8.11.4-2

+-   Added BuildRequires python2, which

 *   Tue Sep 11 2018 Keerthana K <keerthanak@vmware.com> 8.11.4-1

 -   Updated to version 8.11.4 to fix CVE-2018-7161 and CVE-2018-7167.

 *   Wed Feb 14 2018 Xiaolin Li <xiaolinl@vmware.com> 8.3.0-1

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

 Summary:        A JavaScript runtime built on Chrome's V8 JavaScript engine.

 Name:           nodejs

 Version:        9.11.2

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        MIT

 Group:          Applications/System

 Vendor:         VMware, Inc.

@@ -11,8 +11,11 @@ Source0:        https://nodejs.org/download/release/v%{version}/node-v%{version}

 %define         sha1 node=4b1a5582afc298cf77fe47fa61ffc8c7f32f074d

 BuildRequires:  coreutils >= 8.22, openssl-devel >= 1.0.1

+BuildRequires:  python2

+BuildRequires:  which

 Requires:       (coreutils >= 8.22 or toybox)

 Requires:       openssl >= 1.0.1

+Requires:       python2

 %description

 Node.js is a JavaScript runtime built on Chrome's V8 JavaScript engine. Node.js uses an event-driven, non-blocking I/O model that makes it lightweight and efficient. The Node.js package ecosystem, npm, is the largest ecosystem of open source libraries in the world.

@@ -30,7 +33,7 @@ for developing applications that use nodejs.

 %setup -q -n node-v%{version}

 %build

-./configure --prefix=%{_prefix} \

+sh configure --prefix=%{_prefix} \

            --shared-openssl \

            --shared-zlib

@@ -70,6 +73,8 @@ make cctest

 %{_datadir}/systemtap/tapset/node.stp

 %changelog

+*   Tue Jan 08 2019 Alexey Makhalov <amakhalov@vmware.com> 9.11.2-2

+-   Added BuildRequires python2, which

 *   Thu Sep 20 2018 Him Kalyan Bordoloi <bordoloih@vmware.com> 9.11.2-1

 -   Updated to version 9.11.2

 *   Mon Sep 10 2018 Him Kalyan Bordoloi <bordoloih@vmware.com> 9.9.0-1

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

 Summary:        A JavaScript runtime built on Chrome's V8 JavaScript engine.

 Name:           nodejs

 Version:        10.14.1

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        MIT

 Group:          Applications/System

 Vendor:         VMware, Inc.

@@ -11,7 +11,10 @@ Source0:        https://nodejs.org/download/release/v%{version}/node-v%{version}

 %define         sha1 node=ef39d1c5d87e018c0daf22fbdf38c31cfdfce901

 BuildRequires:  coreutils >= 8.22, zlib

+BuildRequires:  python2

+BuildRequires:  which

 Requires:       (coreutils >= 8.22 or toybox)

+Requires:       python2

 %description

 Node.js is a JavaScript runtime built on Chrome's V8 JavaScript engine. Node.js uses an event-driven, non-blocking I/O model that makes it lightweight and efficient. The Node.js package ecosystem, npm, is the largest ecosystem of open source libraries in the world.

@@ -68,6 +71,8 @@ make cctest

 %{_datadir}/systemtap/tapset/node.stp

 %changelog

+*   Thu Jan 10 2019 Alexey Makhalov <amakhalov@vmware.com> 10.14.1-2

+-   Added BuildRequires python2, which

 *   Tue Jan 08 2019 Siju Maliakkal <smaliakkal@vmware.com> 10.14.1-1

 -   Upgrade to 10.14.1 LTS

 *   Thu Sep 20 2018 Him Kalyan Bordoloi <bordoloih@vmware.com> 9.11.2-1

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

 Summary:        A shared library implementation of IPMI and the basic tools

 Name:           openipmi

 Version:        2.0.25

-Release:        1%{?dist}

+Release:        2%{?dist}

 URL:            https://sourceforge.net/projects/openipmi/

 License:        LGPLv2+ and GPLv2+ or BSD

 Group:          System Environment/Base

@@ -17,6 +17,7 @@ BuildRequires:  popt-devel

 BuildRequires:  ncurses-devel

 BuildRequires:  openssl-devel

 BuildRequires:  swig

+BuildRequires:  python2-devel

 Requires:       systemd

 %description

@@ -72,15 +73,13 @@ This package contains a network IPMI listener.

 # USERFIX: Things you might have to add to configure:

 #  --with-tclcflags='-I /usr/include/tclN.M' --with-tcllibs=-ltclN.M

 #    Obviously, replace N.M with the version of tcl on your system.

-./configure                                 \

-    --prefix=/usr                           \

+%configure                                  \

     --with-tcl=no                           \

     --disable-static                        \

     --with-tkinter=no                       \

     --docdir=%{_docdir}/%{name}-%{version}  \

     --with-perl=yes                         \

-    --with-perlinstall=%{perl_vendorarch}   \

-    --sysconfdir=%{_sysconfdir}

+    --with-perlinstall=%{perl_vendorarch}

 make

 %install

@@ -178,6 +177,8 @@ echo "disable ipmi.service" > %{buildroot}%{_libdir}/systemd/system-preset/50-ip

 %{_mandir}/man5/ipmi_sim_cmd.5.gz

 %changelog

+*   Tue Jan 08 2019 Alexey Makhalov <amakhalov@vmware.com> 2.0.25-2

+-   Added BuildRequires python2-devel

 *   Mon Sep 10 2018 Him Kalyan Bordoloi <bordoloih@vmware.com> 2.0.25-1

 -   Upgrade to 2.0.25

 *   Fri Sep 15 2017 Xiaolin Li <xiaolinl@vmware.com> 2.0.24-2

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

 Summary:        Free version of the SSH connectivity tools

 Name:           openssh

 Version:        7.8p1

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        BSD

 URL:            https://www.openssh.com/

 Group:          System Environment/Security

@@ -21,6 +21,7 @@ BuildRequires:  Linux-PAM-devel

 BuildRequires:  krb5-devel

 BuildRequires:  e2fsprogs-devel

 BuildRequires:  systemd

+BuildRequires:  groff

 Requires:       openssh-clients = %{version}-%{release}

 Requires:       openssh-server = %{version}-%{release}

 %description

@@ -53,12 +54,7 @@ tar xf %{SOURCE1} --no-same-owner

 %patch1 -p1

 %patch2 -p1

 %build

-./configure \

-    CFLAGS="%{optflags}" \

-    CXXFLAGS="%{optflags}" \

-    --prefix=%{_prefix} \

-    --bindir=%{_bindir} \

-    --libdir=%{_libdir} \

+%configure \

     --sysconfdir=/etc/ssh \

     --datadir=/usr/share/sshd \

     --with-md5-passwords \

@@ -179,6 +175,9 @@ rm -rf %{buildroot}/*

 %{_mandir}/man8/ssh-pkcs11-helper.8.gz

 %changelog

+*   Tue Jan 08 2019 Alexey Makhalov <amakhalov@vmware.com> 7.8p1-2

+-   Added BuildRequires groff

+-   Use %configure

 *   Tue Sep 11 2018 Him Kalyan Bordoloi <bordoloih@vmware.com> 7.8p1-1

 -   Update version

 *   Tue Nov 28 2017 Xiaolin Li <xiaolinl@vmware.comm> 7.5p1-11

@@ -2,7 +2,7 @@

 Name:           python-fuse

 Version:        0.3.1

-Release:        1%{?dist}

+Release:        2%{?dist}

 Summary:        Python interface to libfuse

 License:        LGPL

 Group:          Development/Languages/Python

@@ -14,7 +14,7 @@ Distribution:   Photon

 BuildRequires:  fuse

 BuildRequires:  fuse-devel

 BuildRequires:  pkg-config

-BuildRequires:  python2

+BuildRequires:  python2-devel

 BuildRequires:  python2-libs

 BuildRequires:  python-setuptools

 Requires:       fuse

@@ -41,7 +41,9 @@ easy_install py

 %{python2_sitelib}/fuse*

 %changelog

-*   Sat Sep 09 2018 Tapas Kundu <tkundu@vmware.com> 0.3.1-1

+*   Thu Jan 10 2019 Alexey Makhalov <amakhalov@vmware.com> 0.3.1-2

+-   Added BuildRequires python2-devel

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

 -   Updated to 0.3.1

 *   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.2.1-2

 -   Change python to python2

@@ -3,7 +3,7 @@

 Summary:        The Python SQL Toolkit and Object Relational Mapper

 Name:           python-sqlalchemy

 Version:        1.2.11

-Release:        1%{?dist}

+Release:        2%{?dist}

 Url:            http://www.sqlalchemy.org

 License:        MIT

 Group:          Development/Languages/Python

@@ -11,7 +11,7 @@ Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        https://pypi.python.org/packages/29/18/a78469bc449d9f92f6269cc62d0d6fbe6bf394d1031b447ad5e54463c3a0/SQLAlchemy-%{version}.tar.gz

 %define sha1    SQLAlchemy=cec4f8ed911e52930c06090458ccf19229a2381a

-BuildRequires:  python2

+BuildRequires:  python2-devel

 BuildRequires:  python2-libs

 BuildRequires:  python-setuptools

 Requires:       python2

@@ -42,6 +42,8 @@ python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}

 %{python2_sitelib}/*

 %changelog

+*   Thu Jan 10 2019 Alexey Makhalov <amakhalov@vmware.com> 1.2.11-2

+-   Added BuildRequires python2-devel

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

 -   Update to version 1.2.11

 *   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.1.7-2

@@ -2,7 +2,7 @@

 Name:           python-subprocess32

 Version:        3.5.2

-Release:        1%{?dist}

+Release:        2%{?dist}

 Summary:        A backport of the subprocess module from Python 3.2/3.3 for use on 2.x

 License:        PSF

 Group:          Development/Languages/Python

@@ -12,7 +12,7 @@ Source0:        subprocess32-%{version}.tar.gz

 Vendor:         VMware, Inc.

 Distribution:   Photon

-BuildRequires:  python2

+BuildRequires:  python2-devel

 BuildRequires:  python2-libs

 BuildRequires:  python-setuptools

 BuildRequires:  python-pytest

@@ -44,6 +44,8 @@ PYTHONPATH=build/lib.linux-%{_arch}-%{python2_ver}/ python2 test_subprocess32.py

 %{python_sitelib}/*

 %changelog

+*   Tue Jan 08 2019 Alexey Makhalov <amakhalov@vmware.com> 3.5.2-2

+-   Added BuildRequires python2-devel

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

 -   Update to version 3.5.2

 *   Mon Sep 25 2017 Rui Gu <ruig@vmware.com> 3.2.7-2

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

 Summary:        A high-level scripting language

 Name:           python2

 Version:        2.7.15

-Release:        3%{?dist}

+Release:        4%{?dist}

 License:        PSF

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

 Group:          System Environment/Programming

@@ -29,9 +29,9 @@ Provides:       /bin/python

 Provides:       /bin/python2

 %description

-The Python 2 package contains the Python development environment. It 

-is useful for object-oriented programming, writing scripts, 

-prototyping large programs or developing entire applications. This 

+The Python 2 package contains the Python development environment. It

+is useful for object-oriented programming, writing scripts,

+prototyping large programs or developing entire applications. This

 version is for backward compatibility with other dependent packages.

 %package libs

@@ -44,13 +44,14 @@ Requires:       ncurses

 Requires:       (coreutils or toybox)

 Requires:       gdbm

 Requires:       bzip2-libs

+%global __requires_exclude ^(/usr/bin/python|python\\(abi\\) = 2\\.7)$

 # Needed for ctypes, to load libraries, worked around for Live CDs size

 # Requires: binutils

 %description libs

-The python interpreter can be embedded into applications wanting to 

-use python as an embedded scripting language.  The python-libs package 

+The python interpreter can be embedded into applications wanting to

+use python as an embedded scripting language.  The python-libs package

 provides the libraries needed for this.

 %package -n python-xml

@@ -62,7 +63,7 @@ Requires: python2-libs = %{version}-%{release}

 The python-xml package provides the libraries needed for XML manipulation.

 %package -n python-curses

-Summary: Python module interface for NCurses Library 

+Summary: Python module interface for NCurses Library

 Group: Applications/System

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

 Requires: ncurses

@@ -116,12 +117,7 @@ The test package contains all regression tests for Python as well as the modules

 %build

 export OPT="${CFLAGS}"

-./configure \

-    CFLAGS="%{optflags}" \

-    CXXFLAGS="%{optflags}" \

-    --prefix=%{_prefix} \

-    --bindir=%{_bindir} \

-    --libdir=%{_libdir} \

+%configure \

     --enable-shared \

     --with-ssl \

     --with-system-expat \

@@ -133,7 +129,7 @@ make %{?_smp_mflags}

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

 make DESTDIR=%{buildroot} install

 chmod -v 755 %{buildroot}%{_libdir}/libpython2.7.so.1.0

-%{_fixperms} %{buildroot}/* 

+%{_fixperms} %{buildroot}/*

 # Remove unused stuff

 find $RPM_BUILD_ROOT/ -name "*~"|xargs rm -f

@@ -155,7 +151,7 @@ rm -rf %{buildroot}/*

 %check

 make test

-%files 

+%files

 %defattr(-, root, root)

 %doc LICENSE README

 %{_bindir}/pydoc*

@@ -165,11 +161,6 @@ make test

 %dir %{_libdir}/python2.7

 %dir %{_libdir}/python2.7/site-packages

-%{_libdir}/libpython2.7.so.*

-/usr/lib/pkgconfig/python-2.7.pc

-/usr/lib/pkgconfig/python.pc

-/usr/lib/pkgconfig/python2.pc

-

 %exclude %{_libdir}/python2.7/bsddb/test

 %exclude %{_libdir}/python2.7/ctypes/test

 %exclude %{_libdir}/python2.7/distutils/tests

@@ -186,6 +177,7 @@ make test

 %defattr(-,root,root)

 %doc LICENSE README

 /usr/lib/python2.7

+%{_libdir}/libpython2.7.so.*

 %exclude %{_libdir}/python2.7/bsddb/test

 %exclude %{_libdir}/python2.7/ctypes/test

 %exclude %{_libdir}/python2.7/distutils/tests

@@ -218,6 +210,9 @@ make test

 %{_libdir}/python2.7/config/*

 %exclude %{_libdir}/python2.7/config/python.o

 %{_libdir}/libpython2.7.so

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

+%{_libdir}/pkgconfig/python.pc

+%{_libdir}/pkgconfig/python2.pc

 %exclude %{_bindir}/smtpd*.py*

 %exclude %{_bindir}/2to3*

 %exclude %{_bindir}/idle*

@@ -235,6 +230,9 @@ make test

 %{_libdir}/python2.7/test/*

 %changelog

+*   Thu Jan 10 2019 Alexey Makhalov <amakhalov@vmware.com> 2.7.15-4

+-   Mode libpython2.7.so to python2-libs

+-   Remove python2 dependency from python2-libs

 *   Fri Dec 21 2018 Tapas Kundu <tkundu@vmware.com> 2.7.15-3

 -   Fix for CVE-2018-14647

 *   Mon Sep 17 2018 Dweep Advani <dadvani@vmware.com> 2.7.15-2

@@ -277,7 +275,7 @@ make test

 *   Wed Sep 14 2016 Divya Thaluru <dthaluru@vmware.com> 2.7.11-7

 -   Improvised pyopenssl patch

 *   Wed Sep 7 2016 Divya Thaluru <dthaluru@vmware.com> 2.7.11-6

--   Added patch to python openssl to validate certificates by ipaddress 

+-   Added patch to python openssl to validate certificates by ipaddress

 *   Mon Jun 20 2016 Divya Thaluru <dthaluru@vmware.com> 2.7.11-5

 -   Added stack-protector flag for ncurses module

 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.7.11-4

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

 Name:          rabbitmq-server

 Summary:       RabbitMQ messaging server

 Version:       3.6.15

-Release:       3%{?dist}

+Release:       4%{?dist}

 Group:         Applications

 Vendor:        VMware, Inc.

 Distribution:  Photon

@@ -19,6 +19,7 @@ BuildRequires: rsync

 BuildRequires: zip

 BuildRequires: libxslt

 BuildRequires: python-xml

+BuildRequires: python2

 BuildArch:     noarch

 %description

@@ -101,6 +102,8 @@ rm -rf $RPM_BUILD_ROOT

 /var/lib/*

 %changelog

+* Tue Feb 05 2019 Alexey Makhalov <amakhalov@vmware.com> 3.6.15-4

+- Added BuildRequires python2.

 * Thu Jan 31 2019 Siju Maliakkal <smaliakkal@vmware.com> 3.6.15-3

 - Consuming erlang 19.3

 * Mon Sep 24 2018 Dweep Advani <dadvani@vmware.com> 3.6.15-2

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

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

 Name:           scons

 Version:        3.0.1

-Release:        1%{?dist}

+Release:        2%{?dist}

 Summary:        An Open Source software construction tool

 Group:          Development/Tools

 License:        MIT

@@ -10,6 +10,7 @@ Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.

 %define sha1    scons=498691cf8d4f6da971b99fab0c3480ef944c4d1e

 Vendor:         VMware, Inc.

 Distribution:   Photon

+BuildRequires:  python2

 Requires:       python2

 BuildArch:      noarch

@@ -43,6 +44,8 @@ rm -rf %{buildroot}

 %{_datadir}/*

 %changelog

+*   Mon Jan 07 2019 Alexey Makhalov <amakhalov@vmware.com> 3.0.1-2

+-   BuildRequires: python2

 *   Tue Sep 18 2018 Srinidhi Rao <srinidhir@vmware.com> 3.0.1-1

 -   Upgraded to version 3.0.1

 *   Sun Oct 15 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.5.1-1

@@ -8,7 +8,7 @@

 Name:          systemtap

 Version:       4.0

-Release:       1%{?dist}

+Release:       2%{?dist}

 Summary:       Programmable system-wide instrumentation system

 Group:         Development/System

 Vendor:	       VMware, Inc.

@@ -32,6 +32,7 @@ BuildRequires: perl

 BuildRequires: python-setuptools

 BuildRequires: nss

 BuildRequires: shadow

+BuildRequires: python2-devel

 %if %with_boost

 BuildRequires: boost-devel

 %endif

@@ -73,6 +74,7 @@ Initscript for Systemtap scripts.

 %package python

 Group:         System/Tools

 Summary:       Python interface for systemtap

+Requires:      python2

 %description python

 This packages has the python interface to systemtap

@@ -355,6 +357,8 @@ fi

 %{_mandir}/man8/systemtap-service.8*

 %changelog

+*   Thu Jan 10 2019 Alexey Makhalov <amakhalov@vmware.com> 4.0-2

+-   Added BuildRequires python2-devel

 *   Tue Dec 04 2018 Keerthana K <keerthanak@vmware.com> 4.0-1

 -   Updated to version 4.0

 *   Mon Sep 10 2018 Keerthana K <keerthanak@vmware.com> 3.3-1

@@ -320,11 +320,11 @@ class SpecParser(object):

                 packageName = listContents[i]

                 if listContents[i].startswith("/"):

                     provider = constants.providedBy.get(listContents[i], None)

-                    i += 1

                     if provider is not None:

                         packageName = provider

                     else:

-                        continue

+                        raise Exception('What package does provide %s? Please modify providedBy in constants.py' % (listContents[i]))

+                    i += 1

                 if i + 2 < len(listContents):

                     if listContents[i+1] in (">=", "<=", "=", "<", ">"):

                         compare = listContents[i+1]

@@ -111,12 +111,8 @@ class constants(object):

         "automake",

         "openssl",

         "openssl-devel",

-        "python2",

         "libdb",

-        "rpm",

-        "groff",

-        "man-pages",

-        "cpio"]

+        "rpm"]

     # List or RPMS that will be installed in a chroot prior to build each

     # package. This list should be ordered by install order. On a stage1

@@ -204,9 +200,6 @@ class constants(object):

         "automake",

         "openssl",

         "openssl-devel",

-        "python2",

-        "python2-libs",

-        "python2-devel",

         "libcap",

         "libdb",

         "libdb-devel",

@@ -214,8 +207,6 @@ class constants(object):

         "rpm-build",

         "rpm-devel",

         "rpm-libs",

-        "groff",

-        "man-pages",

         "cpio"]

     # List of RPMs which are not published. They will be created during the

@@ -302,9 +293,32 @@ class constants(object):

     # Requires: shadow

     providedBy = {

         "/usr/sbin/useradd":"shadow",

+        "/usr/sbin/userdel":"shadow",

         "/usr/sbin/groupadd":"shadow",

+        "/sbin/service":"initscripts",

         "/usr/bin/which":"which",

-        "/bin/sed":"sed"

+        "/usr/bin/python":"python2",

+        "/bin/python":"python2",

+        "/bin/python2":"python2",

+        "/bin/python3":"python3",

+        "/bin/awk":"gawk",

+        "/bin/gawk":"gawk",

+        "/bin/sed":"sed",

+        "/bin/grep":"grep",

+        "/bin/sh":"bash",

+        "/bin/bash":"bash",

+        "/bin/zsh":"zsh",

+        "/bin/tcsh":"tcsh",

+        "/bin/csh":"csh",

+        "/bin/perl":"perl",

+        "/bin/mergerepo":"createrepo_c",

+        "/bin/modifyrepo":"createrepo_c",

+        "/bin/false":"coreutils",

+        "/bin/ln":"coreutils",

+        "/bin/chown":"coreutils",

+        "/bin/cp":"coreutils",

+        "/bin/rm":"coreutils",

+        "/bin/mv":"coreutils"

     }

     @staticmethod

@@ -90,7 +90,7 @@ function check-for-configure()

     exit 1

   fi

-  grep "%configure" $1 > /dev/null || exit 0

+  grep "%configure" $1 > /dev/null || return

   grep -Pzo ".*\\\\(\n)%configure.*" $1

   if [ $? -eq 0 ] ; then

@@ -119,7 +119,11 @@ function check-for-buildrequires()

   fi

 }

-SPECS=`git diff --name-only $1 @ | grep -e "SPECS/.*.spec$"`