@@ -1,5 +1,3 @@

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

-

 Name:           docker-pycreds3

 Version:        0.4.0

 Release:        1%{?dist}

@@ -8,15 +6,18 @@ License:        ASL2.0

 Group:          Development/Languages/Python

 Vendor:         VMware, Inc.

 Distribution:   Photon

-Url:            https://files.pythonhosted.org/packages/c5/e6/d1f6c00b7221e2d7c4b470132c931325c8b22c51ca62417e300f5ce16009/docker-pycreds-%{version}.tar.gz

-Source0:        docker-pycreds-%{version}.tar.gz

-%define sha1    docker-pycreds=36a0e5d70f0a237e2bbd3f87dbd3e60a4e486d53

+URL:            https://github.com/shin-/dockerpy-creds

+

+Source0: https://github.com/shin-/dockerpy-creds/archive/refs/tags/docker-pycreds-%{version}.tar.gz

+%define sha512 docker-pycreds=ca5f68ef2405cc57c0b54224d4f8199c9a4c9217d78f627bffeb950998b09a69b608d1e365cac6859661346fd078c3d081828bb4ff2e18bf7a9384451ae2225a

-BuildRequires:  python3

-BuildRequires:  python3-libs

+BuildRequires:  python3-devel

 BuildRequires:  python3-setuptools

+%if 0%{?with_check}

+BuildRequires:  python3-pytest

+%endif

+

 Requires:       python3

-Requires:       python3-libs

 BuildArch:      noarch

@@ -24,26 +25,34 @@ BuildArch:      noarch

 Python API for docker credentials store

 %prep

-%setup -n docker-pycreds-%{version}

+%autosetup -p1 -n docker-pycreds-%{version}

 %build

-python3 setup.py build

+%py3_build

 %install

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

+%py3_install

+

+%clean

+rm -rf %{buildroot}

+

+%if 0%{?with_check}

+%check

+%pytest

+%endif

 %files

 %defattr(-,root,root,-)

 %{python3_sitelib}/*

 %changelog

-*   Thu Oct 15 2020 Ashwin H <ashwinh@vmware.com> 0.4.0-1

--   Upgrade to 0.4.0 release.

-*   Thu Jun 18 2020 Tapas Kundu <tkundu@vmware.com> 0.3.0-2

-=   Mass removal python2

-*   Tue Sep 04 2018 Tapas Kundu <tkundu@vmware.com> 0.3.0-1

--   Upgraded to 0.3.0 version

-*   Wed Jun 07 2017 Xiaolin Li <xiaolinl@vmware.com> 0.2.1-2

--   Add python3-setuptools and python3-xml to python3 sub package Buildrequires.

-*   Sun Jun 04 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.2.1-1

--   Initial version of docker-pycreds for PhotonOS.

+* Thu Oct 15 2020 Ashwin H <ashwinh@vmware.com> 0.4.0-1

+- Upgrade to 0.4.0 release.

+* Thu Jun 18 2020 Tapas Kundu <tkundu@vmware.com> 0.3.0-2

+- Mass removal python2

+* Tue Sep 04 2018 Tapas Kundu <tkundu@vmware.com> 0.3.0-1

+- Upgraded to 0.3.0 version

+* Wed Jun 07 2017 Xiaolin Li <xiaolinl@vmware.com> 0.2.1-2

+- Add python3-setuptools and python3-xml to python3 sub package Buildrequires.

+* Sun Jun 04 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.2.1-1

+- Initial version of docker-pycreds for PhotonOS.

@@ -6,12 +6,13 @@ Group:         Applications/System

 Vendor:        VMware, Inc.

 License:       MIT

 URL:           https://github.com/stedolan/jq

-Source0:       https://github.com/stedolan/jq/releases/download/jq-%{version}/jq-%{version}.tar.gz

-%define sha1 jq=73bcbdc45be4db907a864e829b06cd869f77f4f7

 Distribution:  Photon

-%if %{with_check}

-BuildRequires: which

+Source0: https://github.com/stedolan/jq/releases/download/jq-%{version}/jq-%{version}.tar.gz

+%define sha512 %{name}=5da71f53c325257f1f546a2520fe47828b495c953270df25ea0e37741463fdda72f0ba4d5b05b25114ec30f27a559344c2b024bacabf610759f4e3e9efadb480

+

+%if 0%{?with_check}

+BuildRequires: which

 %endif

 %description

@@ -26,22 +27,25 @@ Requires:   %{name} = %{version}-%{release}

 Development files for jq

 %prep

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

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

 %build

 autoreconf -fi

-%configure --with-oniguruma=no --disable-static

-make %{?_smp_mflags}

+%configure \

+    --with-oniguruma=no \

+    --disable-static

+

+%make_build

 %install

-make DESTDIR=%{buildroot} install

-find %{buildroot} -name '*.la' -delete

+%make_install %{?_smp_mflags}

+%if 0%{?with_check}

 %check

-make check

+make check %{?_smp_mflags}

+%endif

 %post -p /sbin/ldconfig

-

 %postun -p /sbin/ldconfig

 %clean

@@ -57,15 +61,15 @@ rm -rf %{buildroot}/*

 %{_includedir}/*

 %changelog

-*  Tue Oct 27 2020 Dweep Advani <dadvani@vmware.com> 1.6-2

--  Removed bundled oniguruma library

-*  Tue Jun 30 2020 Gerrit Photon <photon-checkins@vmware.com> 1.6-1

--  Automatic Version Bump

-*  Mon Nov 19 2018 Ashwin H<ashwinh@vmware.com> 1.5-4

--  Add which for %check

-*  Tue Aug 22 2017 Chang Lee <changlee@vmware.com> 1.5-3

--  Add oniguruma for %check

-*  Wed Jun 07 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.5-2

--  Fix for CVE-2015-8863 and CVE-2016-4074

-*  Mon May 15 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.5-1

--  Initial version

+* Tue Oct 27 2020 Dweep Advani <dadvani@vmware.com> 1.6-2

+- Removed bundled oniguruma library

+* Tue Jun 30 2020 Gerrit Photon <photon-checkins@vmware.com> 1.6-1

+- Automatic Version Bump

+* Mon Nov 19 2018 Ashwin H<ashwinh@vmware.com> 1.5-4

+- Add which for %check

+* Tue Aug 22 2017 Chang Lee <changlee@vmware.com> 1.5-3

+- Add oniguruma for %check

+* Wed Jun 07 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.5-2

+- Fix for CVE-2015-8863 and CVE-2016-4074

+* Mon May 15 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.5-1

+- Initial version

@@ -1,53 +1,50 @@

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

-

 Name:           python3-backports_abc

 Version:        0.5

 Release:        4%{?dist}

 Summary:        A backport of recent additions to the 'collections.abc' module.

 License:        PSFL

 Group:          Development/Languages/Python

-Url:            https://github.com/cython/backports_abc

-Source0:        https://pypi.python.org/packages/68/3c/1317a9113c377d1e33711ca8de1e80afbaf4a3c950dd0edfaf61f9bfe6d8/backports_abc-0.5.tar.gz

-%define sha1 backports_abc=91c000d7f18066f428b015caf5308ca34d492f77

-

+URL:            https://github.com/cython/backports_abc

 Vendor:         VMware, Inc.

 Distribution:   Photon

-BuildRequires:  python3

-BuildRequires:  python3-libs

+Source0: https://github.com/cython/backports_abc/archive/refs/tags/backports_abc-%{version}.tar.gz

+%define sha512 backports_abc=7c8a30857a1199e2539279d8fe82456db53fc2c8f0be2c696e029406756f6b7ad3628f4fc5203b58e6a89cb3a0bffdf85feb5af9e7d0bcd4ce0641ac469c9a1a

+

+BuildRequires:  python3-devel

 BuildRequires:  python3-setuptools

+

 Requires:       python3

-Requires:       python3-libs

 BuildArch:      noarch

 %description

-

-

+Backport of recent additions to the "collections.abc" stdlib module (Py3.5)

 %prep

-%setup -n backports_abc-%{version}

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

 %build

-python3 setup.py build

+%py3_build

 %install

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

+%py3_install

+%if 0%{?with_check}

 %check

 python3 tests.py

+%endif

 %files

 %defattr(-,root,root,-)

 %{python3_sitelib}/*

 %changelog

-*   Sat Jun 20 2020 Tapas Kundu <tkundu@vmware.com> 0.5-4

--   Mass removal python2

-*   Tue Dec 17 2019 Vinothkumar D <vinothkumard@vmware.com> 0.5-3

--   To build python2 and python3 backports_abc packages.

-*   Tue Dec 04 2018 Ashwin H <ashwinh@vmware.com> 0.5-2

--   Add %check

-*   Wed Nov 29 2017 Padmini Thirumalachar <pthirumalachar@vmware.com> 0.5-1

--   Initial version of python backports_abc for PhotonOS.

-

+* Sat Jun 20 2020 Tapas Kundu <tkundu@vmware.com> 0.5-4

+- Mass removal python2

+* Tue Dec 17 2019 Vinothkumar D <vinothkumard@vmware.com> 0.5-3

+- To build python2 and python3 backports_abc packages.

+* Tue Dec 04 2018 Ashwin H <ashwinh@vmware.com> 0.5-2

+- Add %check

+* Wed Nov 29 2017 Padmini Thirumalachar <pthirumalachar@vmware.com> 0.5-1

+- Initial version of python backports_abc for PhotonOS.

@@ -1,47 +1,41 @@

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

-

 Name:           python3-fuse

 Version:        1.0.2

 Release:        1%{?dist}

 Summary:        Python interface to libfuse

 License:        LGPL

 Group:          Development/Languages/Python

-Url:            https://github.com/libfuse/%{name}/archive/%{version}.tar.gz

-Source0:        python-fuse-%{version}.tar.gz

-%define sha1    python-fuse=f01919b521bae353d2819cdc62bd54e0711c7a7f

+URL:            https://github.com/libfuse/python-fuse

 Vendor:         VMware, Inc.

 Distribution:   Photon

-BuildRequires:  fuse

+

+Source0: https://github.com/libfuse/python-fuse/archive/refs/tags/python-fuse-%{version}.tar.gz

+%define sha512 python-fuse=9c71e621db41ea70fe0cf824df73b81704f08f38470b6cddd2d7c5933c90edd80af86a0aa20f19e0e4e4aec1dde1c49b65646931cf7debdc5dc875cb3e2d1c31

+

 BuildRequires:  fuse-devel

 BuildRequires:  pkg-config

-BuildRequires:  python3

 BuildRequires:  python3-devel

-BuildRequires:  python3-libs

 BuildRequires:  python3-setuptools

+

 Requires:       fuse

 Requires:       python3

-Requires:       python3-libs

 %description

 FUSE (Filesystem in USErspace) is a simple interface for userspace programs to export a virtual filesystem to the linux kernel. "fuse.py" reexports the root filesystem within the mount point. It also offers a class, fuse.Fuse, which can be subclassed to create a filesystem.

 %prep

-%setup -n python-fuse-%{version}

+%autosetup -p1 -n python-fuse-%{version}

 %build

-python3 setup.py build

+%py3_build

 %install

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

+%py3_install

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

-%check

-easy_install py

-

 %files

 %defattr(-,root,root,-)

 %{python3_sitelib}/fuse*

 %changelog

-*   Thu Feb 18 2021 Tapas Kundu <tkundu@vmware.com> 1.0.2-1

--   Initial packaging for python3-fuse

+* Thu Feb 18 2021 Tapas Kundu <tkundu@vmware.com> 1.0.2-1

+- Initial packaging for python3-fuse

@@ -1,5 +1,3 @@

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

-

 Name:           python3-mako

 Version:        1.1.3

 Release:        2%{?dist}

@@ -8,20 +6,19 @@ License:        MIT

 Group:          Development/Languages/Python

 Vendor:         VMware, Inc.

 Distribution:   Photon

-Url:            https://pypi.python.org/packages/56/4b/cb75836863a6382199aefb3d3809937e21fa4cb0db15a4f4ba0ecc2e7e8e/Mako-%{version}.tar.gz

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

-%define sha1    Mako=098f90baefe938434e426b8682cdfb89fa223eba

+URL:            https://www.makotemplates.org

+

+Source0: https://github.com/sqlalchemy/mako/archive/refs/tags/Mako-%{version}.tar.gz

+%define sha512 Mako=a9b94fa34a61e7794b6e4549fa0bada6ff84dfb0d9edb8d5c7f9b95d12184fa4499f42303cfee720b576a9f7e986a57d91ad3aeb26c9f93154dbc08fb2975952

-BuildRequires:  python3

-BuildRequires:  python3-libs

+BuildRequires:  python3-devel

 BuildRequires:  python3-setuptools

-%if %{with_check}

+%if 0%{?with_check}

 BuildRequires:  python3-pytest

 %endif

 Requires:       python3

-Requires:       python3-libs

 BuildArch:      noarch

@@ -29,17 +26,19 @@ BuildArch:      noarch

 A super-fast templating language that borrows the best ideas from the existing templating languages. Mako is a template library written in Python. It provides a familiar, non-XML syntax which compiles into Python modules for maximum performance. Mako’s syntax and API borrows from the best ideas of many others, including Django templates, Cheetah, Myghty, and Genshi.

 %prep

-%setup -n Mako-%{version}

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

 %build

-python3 setup.py build

+%py3_build

 %install

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

-mv %{buildroot}/%{_bindir}/mako-render %{buildroot}/%{_bindir}/mako-render3

+%py3_install

+mv %{buildroot}%{_bindir}/mako-render %{buildroot}%{_bindir}/mako-render3

+%if 0%{?with_check}

 %check

 python3 setup.py test

+%endif

 %files

 %defattr(-,root,root,-)

@@ -47,21 +46,21 @@ python3 setup.py test

 %{_bindir}/mako-render3

 %changelog

-*   Tue Dec 15 2020 Shreenidhi Shedi <sshedi@vmware.com> 1.1.3-2

--   Fix build with new rpm

-*   Fri Jul 24 2020 Gerrit Photon <photon-checkins@vmware.com> 1.1.3-1

--   Automatic Version Bump

-*   Tue Jun 16 2020 Tapas Kundu <tkundu@vmware.com> 1.0.7-2

--   Mass removal python2

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

--   Update to version 1.0.7

-*   Thu Jul 06 2017 Xiaolin Li <xiaolinl@vmware.com> 1.0.6-5

--   Fix make check issues.

-*   Wed Jun 07 2017 Xiaolin Li <xiaolinl@vmware.com> 1.0.6-4

--   Add python3-setuptools and python3-xml to python3 sub package Buildrequires.

-*   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.0.6-3

--   Separate the python2 and python3 specific scripts in the bin directory

-*   Fri Mar 03 2017 Xiaolin Li <xiaolinl@vmware.com> 1.0.6-2

--   Added python3 package.

-*   Fri Feb 03 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.0.6-1

--   Initial version of python-mako package for Photon.

+* Tue Dec 15 2020 Shreenidhi Shedi <sshedi@vmware.com> 1.1.3-2

+- Fix build with new rpm

+* Fri Jul 24 2020 Gerrit Photon <photon-checkins@vmware.com> 1.1.3-1

+- Automatic Version Bump

+* Tue Jun 16 2020 Tapas Kundu <tkundu@vmware.com> 1.0.7-2

+- Mass removal python2

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

+- Update to version 1.0.7

+* Thu Jul 06 2017 Xiaolin Li <xiaolinl@vmware.com> 1.0.6-5

+- Fix make check issues.

+* Wed Jun 07 2017 Xiaolin Li <xiaolinl@vmware.com> 1.0.6-4

+- Add python3-setuptools and python3-xml to python3 sub package Buildrequires.

+* Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.0.6-3

+- Separate the python2 and python3 specific scripts in the bin directory

+* Fri Mar 03 2017 Xiaolin Li <xiaolinl@vmware.com> 1.0.6-2

+- Added python3 package.

+* Fri Feb 03 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.0.6-1

+- Initial version of python-mako package for Photon.