.gitignore

@@ -1 +1 @@
-SOURCES/jwcrypto-1.5.6.tar.gz
+SOURCES/jwcrypto-0.5.0.tar.gz

.python-jwcrypto.metadata

@@ -1 +1 @@
-e3fdb8f42c60e947cbe58346d086850d915a2b60 SOURCES/jwcrypto-1.5.6.tar.gz
+8eccc6fbeeee2fedc602998a7c7a97b8bd550e59 SOURCES/jwcrypto-0.5.0.tar.gz

SOURCES/0001-ignore-deprecated-annotation.patch

@@ -1,40 +0,0 @@
-diff -Naur jwcrypto-1.5.6/jwcrypto/jwk.py jwcrypto-1.5.6-new/jwcrypto/jwk.py
---- jwcrypto-1.5.6/jwcrypto/jwk.py	2024-02-07 13:52:39.000000000 -0300
-+++ jwcrypto-1.5.6-new/jwcrypto/jwk.py	2024-06-12 13:06:28.553972422 -0300
-@@ -11,7 +11,15 @@
- from cryptography.hazmat.primitives.asymmetric import ec
- from cryptography.hazmat.primitives.asymmetric import rsa
- 
--from typing_extensions import deprecated
-+try:
-+    from typing_extensions import deprecated
-+except ImportError:
-+    def deprecated(_fn, *args):
-+        def inner(func):
-+            return func
-+
-+        return inner
-+
- 
- from jwcrypto.common import JWException
- from jwcrypto.common import base64url_decode, base64url_encode
-diff -Naur jwcrypto-1.5.6/jwcrypto/jwt.py jwcrypto-1.5.6-new/jwcrypto/jwt.py
---- jwcrypto-1.5.6/jwcrypto/jwt.py	2024-02-07 13:52:39.000000000 -0300
-+++ jwcrypto-1.5.6-new/jwcrypto/jwt.py	2024-06-12 13:26:48.534696766 -0300
-@@ -4,7 +4,15 @@
- import time
- import uuid
- 
--from typing_extensions import deprecated
-+try:
-+    from typing_extensions import deprecated
-+except ImportError:
-+    def deprecated(*args):
-+        def inner(func):
-+            return func
-+
-+        return inner
-+
- 
- from jwcrypto.common import JWException, JWKeyNotFound
- from jwcrypto.common import json_decode, json_encode

SPECS/python-jwcrypto.spec

@@ -5,49 +5,42 @@
 %bcond_with python3
 %endif
 
-%if 0%{?fedora} > 31 || 0%{?rhel} > 7
+%if 0%{?rhel} > 7
 # Disable python2 build by default
 %bcond_with python2
 %else
 %bcond_without python2
 %endif
 
-# Disable auto-generation of python dependencies.
-%{?python_disable_dependency_generator}
-
 %global srcname jwcrypto
 
 Name:           python-%{srcname}
-Version:        1.5.6
+Version:        0.5.0
-Release:        2%{?dist}
+Release:        1.1%{?dist}
 Summary:        Implements JWK, JWS, JWE specifications using python-cryptography
 
 License:        LGPLv3+
 URL:            https://github.com/latchset/%{srcname}
 Source0:        https://github.com/latchset/%{srcname}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz
 
-Patch0001:         0001-ignore-deprecated-annotation.patch
-
 BuildArch:      noarch
-%if 0%{?with_python2}
+%if %{with python2}
 BuildRequires:  python2-devel
 BuildRequires:  python2-setuptools
 BuildRequires:  python2-cryptography >= 1.5
 BuildRequires:  python2-pytest
 %endif
-
+%if %{with python3}
-%if 0%{?with_python3}
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-setuptools
-BuildRequires:  python%{python3_pkgversion}-cryptography >= 2.3
+BuildRequires:  python%{python3_pkgversion}-cryptography >= 1.5
 BuildRequires:  python%{python3_pkgversion}-pytest
 %endif
 
 %description
 Implements JWK, JWS, JWE specifications using python-cryptography
 
-
+%if %{with python2}
-%if 0%{?with_python2}
 %package -n python2-%{srcname}
 Summary:        Implements JWK,JWS,JWE specifications using python-cryptography
 Requires:       python2-cryptography >= 1.5
@@ -57,11 +50,10 @@ Requires:       python2-cryptography >= 1.5
 Implements JWK, JWS, JWE specifications using python-cryptography
 %endif
 
-
+%if %{with python3}
-%if 0%{?with_python3}
 %package -n python%{python3_pkgversion}-%{srcname}
 Summary:        Implements JWK, JWS, JWE specifications using python-cryptography
-Requires:       python%{python3_pkgversion}-cryptography >= 2.3
+Requires:       python%{python3_pkgversion}-cryptography >= 1.5
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
 
 %description -n python%{python3_pkgversion}-%{srcname}
@@ -72,48 +64,39 @@ Implements JWK, JWS, JWE specifications using python-cryptography
 %prep
 %setup -q -n %{srcname}-%{version}
 
-for p in %patches; do
-    %__patch -p1 -i $p
-done
-
 
 %build
-%if 0%{?with_python2}
+%if %{with python2}
 %py2_build
 %endif
-%if 0%{?with_python3}
+%if %{with python3}
 %py3_build
 %endif
 
 
 %check
-%if 0%{?with_python2}
+%if %{with python2}
 %{__python2} -bb -m pytest %{srcname}/test*.py
 %endif
-%if 0%{?with_python3}
+%if %{with python3}
 %{__python3} -bb -m pytest %{srcname}/test*.py
 %endif
 
 
 %install
-%if 0%{?with_python2}
+%if %{with python2}
 %py2_install
-%endif
-%if 0%{?with_python3}
-%py3_install
-%endif
-
 rm -rf %{buildroot}%{_docdir}/%{srcname}
-%if 0%{?with_python2}
 rm -rf %{buildroot}%{python2_sitelib}/%{srcname}/tests{,-cookbook}.py*
 %endif
-%if 0%{?with_python3}
+%if %{with python3}
+%py3_install
 rm -rf %{buildroot}%{python3_sitelib}/%{srcname}/tests{,-cookbook}.py*
 rm -rf %{buildroot}%{python3_sitelib}/%{srcname}/__pycache__/tests{,-cookbook}.*.py*
 %endif
+rm -rf %{buildroot}/usr/share/doc/jwcrypto
 
-
+%if %{with python2}
-%if 0%{?with_python2}
 %files -n python2-%{srcname}
 %doc README.md
 %license LICENSE
@@ -121,7 +104,7 @@ rm -rf %{buildroot}%{python3_sitelib}/%{srcname}/__pycache__/tests{,-cookbook}.*
 %{python2_sitelib}/%{srcname}-%{version}-py%{python2_version}.egg-info
 %endif
 
-%if 0%{?with_python3}
+%if %{with python3}
 %files -n python%{python3_pkgversion}-%{srcname}
 %doc README.md
 %license LICENSE
@@ -131,73 +114,18 @@ rm -rf %{buildroot}%{python3_sitelib}/%{srcname}/__pycache__/tests{,-cookbook}.*
 
 
 %changelog
-* Fri Aug 09 2024 Rafael Jeffman <rjeffman@redhat.com> - 1.5.6-2
+* Fri Jun 17 2022 Christian Heimes <cheimes@redhat.com> - 0.5.0-1.1
-- Disable auto-generation of dependencies
+- Bump dist to solve version sorting issue, fixes RHBZ#2097800
-  Related: RHEL-34809
 
-* Tue Jun 18 2024 Rafael Jeffman <rjeffman@redhat.com> - 1.5.6-1
+* Thu Jun 28 2018 Christian Heimes <cheimes@redhat.com> - 0.5.0-1
-- Rebase to version 1.5.6
-  Resolve: RHEL-34809
-
-* Thu Apr 04 2024 Rafael Jeffman <rjeffman@redhat.com> - 0.8-5
-- Address potential DoS with high compression ratio
-  Resolves: RHEL-28698
-
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.8-4
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.8-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Dec 01 2020 Simo Sorce <simo@redhat.com> - 0.8-1
-- Sync with upstream release 0.8
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.6.0-8
-- Rebuilt for Python 3.9
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.6.0-6
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Thu Aug 29 2019 Christian Heimes <cheimes@redhat.com> - 0.6.0-5
-- Remove Python 2 subpackages from F32+
-- Resolves: RHBZ #1746760
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.6.0-4
-- Rebuilt for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Nov 05 2018 Christian Heimes <cheimes@redhat.com> - 0.6.0-1
-- New upstream release 0.6.0
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 0.5.0-2
-- Rebuilt for Python 3.7
-
-* Wed Jun 27 2018 Christian Heimes <cheimes@redhat.com> - 0.5.0-1
 - New upstream release 0.5.0
+- Fixes Coverity scan issue
 
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 0.4.2-5
+* Mon Apr 16 2018 Christian Heimes <cheimes@redhat.com> - 0.4.2-5
-- Rebuilt for Python 3.7
+- Drop Python 2 subpackages from RHEL 8, fixes RHBZ#1567152
 
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.2-4
+* Thu Nov 23 2017 Christian Heimes <cheimes@redhat.com> - 0.4.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+- Build Python 3 package on RHEL > 7, fixes RHBZ#1516813
 
 * Wed Aug 02 2017 Christian Heimes <cheimes@redhat.com> - 0.4.2-3
 - Run tests with bytes warning