deleted file mode 100644

@@ -1,17 +0,0 @@

-From 5cffb1ed6a7f5afe74e4384d59f1670be29a7930 Mon Sep 17 00:00:00 2001

-From: elena <elena@rategia.com>

-Date: Tue, 24 Apr 2018 13:44:30 +0300

-Subject: [PATCH] Explain that the orderness of the result is system-dependant

-

-+++ b/Doc/library/glob.rst	2019-11-05 05:42:58.296024048 +0000

-@@ -42,7 +42,8 @@ For example, ``'[?]'`` matches the chara

-    a string containing a path specification. *pathname* can be either absolute

-    (like :file:`/usr/src/Python-1.5/Makefile`) or relative (like

-    :file:`../../Tools/\*/\*.gif`), and can contain shell-style wildcards. Broken

--   symlinks are included in the results (as in the shell).

-+   symlinks are included in the results (as in the shell). Whether or not the

-+   results are sorted depends on the file system.

- 

-    .. index::

-       single: **; in glob-style wildcards

@@ -1,43 +1,106 @@

 %__python3 /usr/bin/python3

+%python3 %__python3

 %python3_sitelib %(%{__python3} -Ic "from distutils.sysconfig import get_python_lib; print(get_python_lib())")

 %python3_sitearch %(%{__python3} -Ic "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")

-%python3_version %(%{__python3} -Ic "import sys; sys.stdout.write(sys.version[:3])")

-%python3_version_nodots %(%{__python3} -Ic "import sys; sys.stdout.write(sys.version[:3].replace('.',''))")

+%python3_version %(%{__python3} -Ic "import sys; sys.stdout.write('{0.major}.{0.minor}'.format(sys.version_info))")

+%python3_version_nodots %(%{__python3} -Ic "import sys; sys.stdout.write('{0.major}{0.minor}'.format(sys.version_info))")

 %python3_platform %(%{__python3} -Ic "import sysconfig; print(sysconfig.get_platform())")

+%python3_platform_triplet %(%{__python3} -Ic "import sysconfig; print(sysconfig.get_config_var('MULTIARCH'))")

+%python3_ext_suffix %(%{__python3} -Ic "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX'))")

 %py3dir %{_builddir}/python3-%{name}-%{version}-%{release}

- 

+

+%py_setup setup.py

 %py3_shbang_opts -s

- 

+%py3_shbang_opts_nodash %(opts=%{py3_shbang_opts}; echo ${opts#-})

+%py3_shebang_flags %(opts=%{py3_shbang_opts}; echo ${opts#-})

+%py3_shebang_fix %{expand:\\\

+  if [ -f /usr/bin/pathfix%{python3_version}.py ]; then

+    pathfix=/usr/bin/pathfix%{python3_version}.py

+  else

+    # older versions of Python don't have it and must BR /usr/bin/pathfix.py from python3-devel explicitly

+    pathfix=/usr/bin/pathfix.py

+  fi

+  if [ -z "%{?py3_shebang_flags}" ]; then

+    shebang_flags="-k"

+  else

+    shebang_flags="-ka%{py3_shebang_flags}"

+  fi

+  $pathfix -pni %{__python3} $shebang_flags}

+

 # Use the slashes after expand so that the command starts on the same line as

 # the macro

 %py3_build() %{expand:\\\

   CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\

   %{__python3} %{py_setup} %{?py_setup_args} build --executable="%{__python3} %{py3_shbang_opts}" %{?*}

-  sleep 1

 }

- 

+

 %py3_build_egg() %{expand:\\\

   CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\

   %{__python3} %{py_setup} %{?py_setup_args} bdist_egg %{?*}

-  sleep 1

 }

- 

+

 %py3_build_wheel() %{expand:\\\

   CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\

   %{__python3} %{py_setup} %{?py_setup_args} bdist_wheel %{?*}

-  sleep 1

 }

- 

+

 %py3_install() %{expand:\\\

   CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\

   %{__python3} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?*}

+  rm -rfv %{buildroot}%{_bindir}/__pycache__

 }

- 

+

 %py3_install_egg() %{expand:\\\

   mkdir -p %{buildroot}%{python3_sitelib}

-  easy_install-%{python3_version} -m --prefix %{buildroot}%{_prefix} -Z dist/*-py%{python3_version}.egg %{?*}

+  %{__python3} -m easy_install -m --prefix %{buildroot}%{_prefix} -Z dist/*-py%{python3_version}.egg %{?*}

+  rm -rfv %{buildroot}%{_bindir}/__pycache__

 }

- 

+

 %py3_install_wheel() %{expand:\\\

-  pip%{python3_version} install -I dist/%{1} --root %{buildroot} --strip-file-prefix %{buildroot} --no-deps

+  %{__python3} -m pip install -I dist/%{1} --root %{buildroot} --no-deps --no-index --no-warn-script-location

+  rm -rfv %{buildroot}%{_bindir}/__pycache__

+  for distinfo in %{buildroot}%{python3_sitelib}/*.dist-info %{buildroot}%{python3_sitearch}/*.dist-info; do

+    if [ -f ${distinfo}/direct_url.json ]; then

+      rm -fv ${distinfo}/direct_url.json

+      sed -i '/direct_url.json/d' ${distinfo}/RECORD

+    fi

+  done

 }

+

+# With $PATH and $PYTHONPATH set to the %%buildroot,

+# try to import the given Python 3 module(s).

+# Useful as a smoke test in %%check when running tests is not feasible.

+# Use spaces or commas as separators.

+%py3_check_import() %{expand:\\\

+  (cd %{_topdir} &&\\\

+  PATH="%{buildroot}%{_bindir}:$PATH"\\\

+  PYTHONPATH="${PYTHONPATH:-%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib}}"\\\

+  PYTHONDONTWRITEBYTECODE=1\\\

+  %{__python3} -c "import %{lua:local m=rpm.expand('%{?*}'):gsub('[%s,]+', ', ');print(m)}"

+  )

+}

+

+# This only supports Python 3.5+ and will never work with Python 2.

+# Hence, it has no Python version in the name.

+%pycached() %{lua:

+  path = rpm.expand("%{?*}")

+  if (string.sub(path, "-3") ~= ".py") then

+    rpm.expand("%{error:%%pycached can only be used with paths explicitly ending with .py}")

+  else

+    print(path)

+    pyminor = path:match("/python3.(%d+)/") or "*"

+    dirname = path:match("(.*/)")

+    modulename = path:match(".*/([^/]+).py")

+    print("\\n" .. dirname .. "__pycache__/" .. modulename .. ".cpython-3" .. pyminor .. "{,.opt-?}.pyc")

+  end

+}

+

+# This is intended for Python 3 only, hence also no Python version in the name.

+%__pytest /usr/bin/pytest%(test %{python3_pkgversion} == 3 || echo -%{python3_version})

+%pytest %{expand:\\\

+  CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\

+  PATH="%{buildroot}%{_bindir}:$PATH"\\\

+  PYTHONPATH="${PYTHONPATH:-%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib}}"\\\

+  PYTHONDONTWRITEBYTECODE=1\\\

+  %{?__pytest_addopts:PYTEST_ADDOPTS="${PYTEST_ADDOPTS:-} %{__pytest_addopts}"}\\\

+  %__pytest}

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

 Summary:        A high-level scripting language

 Name:           python3

 Version:        3.9.1

-Release:        3%{?dist}

+Release:        4%{?dist}

 License:        PSF

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

 Group:          System Environment/Programming

@@ -10,7 +10,9 @@ Distribution:   Photon

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

 %define sha1    Python=77f4105846f6740297e50d7535a42c02d6b8e7db

 Source1:        macros.python

+

 Patch0:         cgi3.patch

+

 BuildRequires:  pkg-config >= 0.28

 BuildRequires:  bzip2-devel

 BuildRequires:  ncurses-devel

@@ -23,6 +25,7 @@ BuildRequires:  sqlite-devel

 BuildRequires:  util-linux-devel

 # cross compilation requires native python3 installed for ensurepip

 %define BuildRequiresNative python3-xml

+

 Requires:       ncurses

 Requires:       openssl

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

@@ -57,7 +60,6 @@ Requires:       sqlite-libs

 Requires:       bzip2-libs

 Requires:       util-linux-libs

-

 %description    libs

 The python interpreter can be embedded into applications wanting to

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

@@ -153,30 +155,30 @@ You should not need to install this package manually as the various

 python-devel packages require it. So install a python-devel package instead.

 %prep

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

-%patch0 -p1

+%autosetup -p1 -n Python-%{version}

 %build

 export OPT="${CFLAGS}"

 if [ %{_host} != %{_build} ]; then

-  ln -s python3 /bin/python

+  ln -sfv python3 /bin/python

   export ac_cv_buggy_getaddrinfo=no

   export ac_cv_file__dev_ptmx=yes

   export ac_cv_file__dev_ptc=no

 fi

+

 %configure \

-    CFLAGS="%{optflags}" \

-    CXXFLAGS="%{optflags}" \

     --enable-shared \

     --with-system-expat \

     --with-system-ffi \

     --enable-optimizations \

     --with-dbmliborder=gdbm:ndbm

+

 make %{?_smp_mflags}

 %install

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

-make DESTDIR=%{buildroot} install

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

+

+make DESTDIR=%{buildroot} install %{?_smp_mflags}

 %{_fixperms} %{buildroot}/*

 # Remove unused stuff

@@ -189,7 +191,7 @@ mkdir -p %{buildroot}/usr/lib/rpm/macros.d

 install -m 644 %{SOURCE1} %{buildroot}/usr/lib/rpm/macros.d

 %check

-make  %{?_smp_mflags} test

+make %{?_smp_mflags} test

 %post

 ln -sf /usr/bin/python3 /usr/bin/python

@@ -203,7 +205,7 @@ if [ $1 -eq 0 ] ; then

     if [ -f "/usr/bin/python2" ]; then

         ln -sf /usr/bin/python2 /usr/bin/python

     else

-        rm /usr/bin/python

+        rm -f /usr/bin/python

     fi

 fi

 /sbin/ldconfig

@@ -300,6 +302,8 @@ rm -rf %{buildroot}/*

 %{_libdir}/rpm/macros.d/macros.python

 %changelog

+*   Mon Aug 16 2021 Shreenidhi Shedi <sshedi@vmware.com> 3.9.1-4

+-   Fix python rpm macros

 *   Sat Mar 27 2021 Tapas Kundu <tkundu@vmware.com> 3.9.1-3

 -   Remove packaging exe files in python3-pip

 *   Sat Jan 16 2021 Shreenidhi Shedi <sshedi@vmware.com> 3.9.1-2

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

 Summary:        Package manager

 Name:           rpm

 Version:        4.16.1.2

-Release:        6%{?dist}

+Release:        7%{?dist}

 License:        GPLv2+

 URL:            http://rpm.org

 Group:          Applications/System

@@ -46,7 +46,6 @@ BuildRequires:  file-devel

 BuildRequires:  python3-devel

 BuildRequires:  openssl >= 1.1.1

 BuildRequires:  zstd-devel

-BuildRequires:  systemd-rpm-macros

 %description

 RPM package manager

@@ -80,6 +79,7 @@ Requires:   %{name}-devel = %{version}-%{release}

 Requires:   elfutils-libelf

 Requires:   cpio

 Requires:   systemd-rpm-macros

+Requires:   python3-macros

 Summary:    Binaries, scripts and libraries needed to build rpms.

 %description build

 Binaries, libraries and scripts to build rpms.

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

 %{python3_sitelib}/*

 %changelog

+*   Mon Aug 16 2021 Shreenidhi Shedi <sshedi@vmware.com> 4.16.1.2-7

+-   Add python3-macros to rpm-build

 *   Wed Jul 28 2021 Shreenidhi Shedi <sshedi@vmware.com> 4.16.1.2-6

 -   Remove python dependency from rpm main package

 *   Wed Jul 14 2021 Susant Sahani <ssahani@vmware.com> 4.16.1.2-5