.gitignore

@@ -1 +1 @@
-SOURCES/jsonpatch-1.33.tar.gz
+SOURCES/jsonpatch-1.21.tar.gz

.python-jsonpatch.metadata

@@ -1 +1 @@
-d4b5e2451ffa1057e89255ac8e9bb85140d42ae7 SOURCES/jsonpatch-1.33.tar.gz
+566ad58af09f3a68d025a985318387630e1f7809 SOURCES/jsonpatch-1.21.tar.gz

SPECS/python-jsonpatch.spec

@@ -1,12 +1,26 @@
 %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%{?fedora} || 0%{?rhel} > 7
+# Disable python2 build by default
+%bcond_with python2
+%else
+%bcond_without python2
+%endif
+
 Name:           python-%{pypi_name}
-Version:        1.33
+Version:        1.21
-Release:        6%{?dist}
+Release:        16%{?dist}
 Summary:        Applying JSON Patches in Python
 
-License:        BSD-3-Clause
+License:        BSD
-URL:            https://github.com/stefankoegl/python-json-patch
+URL:            https://github.com/stefankoegl/%{github_name}
 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
@@ -17,6 +31,22 @@ 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
 
@@ -29,82 +59,86 @@ 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}
-%patch -P 0 -p1
+%patch0 -p1
 
 
 %build
+%if %{with python2}
+%py2_build
+%endif # with python2
+
+%if %{with python3}
 %py3_build
+%endif # with python3
 
 %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}
 %py3_install
-# remove jsondiff binary conflicting with python-jsondiff
+for bin in jsondiff jsonpatch; do
-# https://bugzilla.redhat.com/show_bug.cgi?id=2029805
+mv %{buildroot}%{_bindir}/$bin %{buildroot}%{_bindir}/$bin-%{python3_version}
-rm %{buildroot}%{_bindir}/jsondiff
+ln -s ./$bin-%{python3_version} %{buildroot}%{_bindir}/$bin-3
-mv %{buildroot}%{_bindir}/jsonpatch %{buildroot}%{_bindir}/jsonpatch-%{python3_version}
+ln -s ./$bin-%{python3_version} %{buildroot}%{_bindir}/$bin
-ln -s ./jsonpatch-%{python3_version} %{buildroot}%{_bindir}/jsonpatch-3
+done;
-ln -s ./jsonpatch-%{python3_version} %{buildroot}%{_bindir}/jsonpatch
+%endif # with python3
 
 %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 LICENSE
+%license COPYING
+%{_bindir}/jsondiff
 %{_bindir}/jsonpatch
+%{_bindir}/jsondiff-3*
 %{_bindir}/jsonpatch-3*
 %{python3_sitelib}/%{pypi_name}.py*
 %{python3_sitelib}/__pycache__/*
 %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info
+%endif # with python3
 
 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.33-6
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.21-16
-- Bump release for October 2024 mass rebuild:
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Resolves: RHEL-64018
+  Related: rhbz#1991688
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.33-5
-- Bump release for June 2024 mass rebuild
-
-* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jul 15 2023 Orion Poplawski <orion@nwra.com> - 1.33-1
-- Update to 1.33
-
-* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 1.21-23
-- Rebuilt for Python 3.12
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.21-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.21-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.21-20
-- Rebuilt for Python 3.11
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.21-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Dec  7 2021 Alan Pevec <apevec AT redhat.com> - 1.21-18
-- Drop conflicting jsondiff binary rhbz#2029805
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.21-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 1.21-16
-- Rebuilt for Python 3.10
 
-* Thu Mar  4 2021 Tim Landscheidt <tim@tim-landscheidt.de> - 1.21-15
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.21-15
-- Fix mangled URL
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.21-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild