From 4fd23311a2b1be4a66dcc7ece0ff3f74ab7f0bec Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 14 May 2025 17:52:25 +0000 Subject: [PATCH] import UBI python-jsonpatch-1.33-6.el10 --- .gitignore | 3 +- gating.yaml | 6 -- python-jsonpatch.spec | 186 ++++++++++++++++++++++-------------------- sources | 2 +- 4 files changed, 100 insertions(+), 97 deletions(-) delete mode 100644 gating.yaml diff --git a/.gitignore b/.gitignore index 1bf95e4..6e58a86 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -SOURCES/jsonpatch-1.21.tar.gz -/jsonpatch-1.21.tar.gz +jsonpatch-1.33.tar.gz diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index e60e254..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-8 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: 3rd-azure-ci.brew-build.tier1.functional} diff --git a/python-jsonpatch.spec b/python-jsonpatch.spec index 1f00834..4654228 100644 --- a/python-jsonpatch.spec +++ b/python-jsonpatch.spec @@ -1,26 +1,12 @@ %global pypi_name jsonpatch -%if 0%{?fedora} || 0%{?rhel} > 7 -# Enable python3 build by default -%bcond_without python3 -%else -%bcond_with python3 -%endif - -%if 0%{?rhel} > 7 -# Disable python2 build by default -%bcond_with python2 -%else -%bcond_without python2 -%endif - Name: python-%{pypi_name} -Version: 1.21 -Release: 2%{?dist} +Version: 1.33 +Release: 6%{?dist} Summary: Applying JSON Patches in Python -License: BSD -URL: https://github.com/stefankoegl/%{github_name} +License: BSD-3-Clause +URL: https://github.com/stefankoegl/python-json-patch Source0: https://pypi.io/packages/source/j/jsonpatch/%{pypi_name}-%{version}.tar.gz # tarball from pypi does not include file tests.js required for a specific test. # upstream issue https://github.com/stefankoegl/python-json-patch/issues/82 @@ -31,22 +17,6 @@ BuildArch: noarch %description Library to apply JSON Patches according to RFC 6902 - Python 2 build. -%if %{with python2} -%package -n python2-%{pypi_name} -Summary: Applying JSON Patches in Python 2 - -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-jsonpointer -Requires: python2-jsonpointer - -%{?python_provide:%python_provide python2-%{pypi_name}} - -%description -n python2-%{pypi_name} -Library to apply JSON Patches according to RFC 6902 - Python 2 build. -%endif # with python2 - -%if %{with python3} %package -n python3-%{pypi_name} Summary: Applying JSON Patches in Python 3 @@ -59,80 +29,120 @@ Requires: python3-jsonpointer %description -n python3-%{pypi_name} Library to apply JSON Patches according to RFC 6902 - Python 3 build. -%endif # with python3 %prep %setup -qn %{pypi_name}-%{version} -%patch0 -p1 +%patch -P 0 -p1 %build -%if %{with python2} -%py2_build -%endif # with python2 - -%if %{with python3} -LANG=en_US.utf8 %py3_build -%endif # with python3 +%py3_build %install -%if %{with python2} -%py2_install -for bin in jsondiff jsonpatch; do -mv %{buildroot}%{_bindir}/$bin %{buildroot}%{_bindir}/$bin-%{python2_version} -ln -s ./$bin-%{python2_version} %{buildroot}%{_bindir}/$bin-2 -%if !0%{?with_python3} -ln -s ./$bin-%{python2_version} %{buildroot}%{_bindir}/$bin -%endif -done; -%endif # with python2 - -%if %{with python3} -LANG=en_US.utf8 %py3_install -for bin in jsondiff jsonpatch; do -mv %{buildroot}%{_bindir}/$bin %{buildroot}%{_bindir}/$bin-%{python3_version} -ln -s ./$bin-%{python3_version} %{buildroot}%{_bindir}/$bin-3 -ln -s ./$bin-%{python3_version} %{buildroot}%{_bindir}/$bin -done; -%endif # with python3 +%py3_install +# remove jsondiff binary conflicting with python-jsondiff +# https://bugzilla.redhat.com/show_bug.cgi?id=2029805 +rm %{buildroot}%{_bindir}/jsondiff +mv %{buildroot}%{_bindir}/jsonpatch %{buildroot}%{_bindir}/jsonpatch-%{python3_version} +ln -s ./jsonpatch-%{python3_version} %{buildroot}%{_bindir}/jsonpatch-3 +ln -s ./jsonpatch-%{python3_version} %{buildroot}%{_bindir}/jsonpatch %check -%if %{with python2} -%{__python2} tests.py -%endif # with python2 - -%if %{with python3} %{__python3} tests.py -%endif # with python3 -%if %{with python2} -%files -n python2-%{pypi_name} -%doc README.md -%license COPYING -%if !0%{?with_python3} -%{_bindir}/jsondiff -%{_bindir}/jsonpatch -%endif -%{_bindir}/jsondiff-2* -%{_bindir}/jsonpatch-2* -%{python2_sitelib}/%{pypi_name}.py* -%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info -%endif # with python2 - -%if %{with python3} %files -n python3-%{pypi_name} %doc README.md -%license COPYING -%{_bindir}/jsondiff +%license LICENSE %{_bindir}/jsonpatch -%{_bindir}/jsondiff-3* %{_bindir}/jsonpatch-3* %{python3_sitelib}/%{pypi_name}.py* %{python3_sitelib}/__pycache__/* -%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info -%endif # with python3 +%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Tue Oct 29 2024 Troy Dawson - 1.33-6 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 1.33-5 +- Bump release for June 2024 mass rebuild + +* Fri Jan 26 2024 Fedora Release Engineering - 1.33-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 1.33-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 1.33-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jul 15 2023 Orion Poplawski - 1.33-1 +- Update to 1.33 + +* Tue Jun 13 2023 Python Maint - 1.21-23 +- Rebuilt for Python 3.12 + +* Fri Jan 20 2023 Fedora Release Engineering - 1.21-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 1.21-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 1.21-20 +- Rebuilt for Python 3.11 + +* Fri Jan 21 2022 Fedora Release Engineering - 1.21-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Dec 7 2021 Alan Pevec - 1.21-18 +- Drop conflicting jsondiff binary rhbz#2029805 + +* Fri Jul 23 2021 Fedora Release Engineering - 1.21-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jun 03 2021 Python Maint - 1.21-16 +- Rebuilt for Python 3.10 + +* Thu Mar 4 2021 Tim Landscheidt - 1.21-15 +- Fix mangled URL + +* Wed Jan 27 2021 Fedora Release Engineering - 1.21-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.21-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat May 23 2020 Miro Hrončok - 1.21-12 +- Rebuilt for Python 3.9 + +* Thu Jan 30 2020 Fedora Release Engineering - 1.21-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Oct 03 2019 Miro Hrončok - 1.21-10 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Thu Aug 15 2019 Miro Hrončok - 1.21-9 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 1.21-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Feb 27 2019 Yatin Karel - 1.21-7 +- Disable python2 build in Fedora + +* Sat Feb 02 2019 Fedora Release Engineering - 1.21-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek - 1.21-5 +- Drop explicit locale setting + See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot + +* Sat Jul 14 2018 Fedora Release Engineering - 1.21-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Jun 15 2018 Miro Hrončok - 1.21-3 +- Rebuilt for Python 3.7 + * Thu Mar 15 2018 Charalampos Stratakis - 1.21-2 - Don't build Python 2 subpackage on EL > 7 diff --git a/sources b/sources index 542368e..1547369 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jsonpatch-1.21.tar.gz) = dc902b750241833a68612430f07007080ed56dce8a7a4bdd1c042f944cd6cfdc03f4b422cc6bed6bc3b21ea390c5a281cd08181e27d6b57fc5fb657787c1d740 +SHA512 (jsonpatch-1.33.tar.gz) = a0f56e82cc5a0d9d76680489ba8eec122378d6322c83d8e97c7276df9b32bc7735bec69d6ed9ed2e139f016b127e47eeb4a948b1394fd31079f19b390bbbc50b