diff --git a/.gitignore b/.gitignore
index 5dc5db5..368f1dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1 @@
-/sortedcontainers-1.5.7.tar.gz
-/sortedcontainers-1.5.9.tar.gz
-/sortedcontainers-1.5.10.tar.gz
-/sortedcontainers-2.0.1.tar.gz
-/python-sortedcontainers-2.0.4.tar.gz
-/python-sortedcontainers-2.0.5.tar.gz
-/python-sortedcontainers-2.1.0.tar.gz
-/python-sortedcontainers-2.2.0.tar.gz
-/python-sortedcontainers-2.2.1.tar.gz
-/python-sortedcontainers-2.2.2.tar.gz
-/python-sortedcontainers-2.3.0.tar.gz
-/python-sortedcontainers-2.4.0.tar.gz
+SOURCES/python-sortedcontainers-2.4.0.tar.gz
diff --git a/.python-sortedcontainers.metadata b/.python-sortedcontainers.metadata
new file mode 100644
index 0000000..21a3050
--- /dev/null
+++ b/.python-sortedcontainers.metadata
@@ -0,0 +1 @@
+5a3a969ca3200ce67e9404ff9615109d45be5525  SOURCES/python-sortedcontainers-2.4.0.tar.gz
diff --git a/python-sortedcontainers.spec b/SPECS/python-sortedcontainers.spec
similarity index 71%
rename from python-sortedcontainers.spec
rename to SPECS/python-sortedcontainers.spec
index 54f2061..43c76e6 100644
--- a/python-sortedcontainers.spec
+++ b/SPECS/python-sortedcontainers.spec
@@ -2,10 +2,10 @@
 
 Name:           python-%{srcname}
 Version:        2.4.0
-Release:        5%{?dist}
+Release:        19%{?dist}
 Summary:        Pure Python sorted container types
 
-License:        ASL 2.0
+License:        Apache-2.0
 URL:            https://pypi.python.org/pypi/%{srcname}
 # PyPI tarball does not include docs or tests.
 Source0:        https://github.com/grantjenks/python-sortedcontainers/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -26,12 +26,7 @@ BuildRequires: make
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-setuptools
 
-# Temporarily disable tests on el9 due to missing dependencies (#2041316)
-%if 0%{?el9}
 %bcond_with tests
-%else
-%bcond_without tests
-%endif
 %if %{with tests}
 BuildRequires:  python%{python3_pkgversion}-pytest
 BuildRequires:  python%{python3_pkgversion}-matplotlib
@@ -100,8 +95,56 @@ popd
 
 
 %changelog
-* Sun Jan 16 2022 Davide Cavalca <dcavalca@fedoraproject.org> - 2.4.0-5
-- Temporarily disable tests on el9 due to missing dependencies (#2041316)
+* Tue Dec 17 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 2.4.0-19
+- Rebuilt for MSVSphere 10
+
+* Tue Sep 3 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2.4.0-19
+- Disable tests, which require python-matplotlib, which in turn have an
+extensive list of BRs including tex, xorg-x11-server-Xvfb, inkscape, and
+half a dozen pyton-* pkgs. When all the BRs are satisfied we can enable
+tests again.
+
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat Jun 08 2024 Python Maint <python-maint@redhat.com> - 2.4.0-17
+- Rebuilt for Python 3.13
+
+* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 2.4.0-16
+- Bootstrap for Python 3.13
+
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jun 29 2023 Python Maint <python-maint@redhat.com> - 2.4.0-12
+- Rebuilt for Python 3.12
+
+* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 2.4.0-11
+- Bootstrap for Python 3.12
+
+* Sat Apr 08 2023 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.4.0-10
+- Switch to SPDX license
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jun 15 2022 Python Maint <python-maint@redhat.com> - 2.4.0-7
+- Rebuilt for Python 3.11
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 2.4.0-6
+- Bootstrap for Python 3.11
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
diff --git a/sources b/sources
deleted file mode 100644
index c1cf0d4..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (python-sortedcontainers-2.4.0.tar.gz) = f80185c6f95a85cc78f88f6f6cf389eb48be22cf94d5fcd84f3592873f17de37ec7f44c1627b7f02956ac4b4f74ca4febefc47d3c6232f70ee05dbb2449ad770