From cd6bad93746dd7807df722811f7005104e9e59dc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:24:39 +0000 Subject: [PATCH 01/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- aggregate6.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aggregate6.spec b/aggregate6.spec index 77c3723..ce4729e 100644 --- a/aggregate6.spec +++ b/aggregate6.spec @@ -1,7 +1,7 @@ Summary: Tool to compress an unsorted list of IPv4 and IPv6 prefixes Name: aggregate6 Version: 1.0.12 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD-2-Clause URL: https://github.com/job/aggregate6 Source0: https://github.com/job/aggregate6/archive/%{version}/%{name}-%{version}.tar.gz @@ -90,6 +90,9 @@ PYTHONPATH=$RPM_BUILD_ROOT%{python3_sitelib} pytest-3 %license LICENSE %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.0.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Aug 08 2023 Robert Scheck 1.0.12-2 - Changes to match the Fedora Packaging Guidelines From 32cde545ab02ec77392947340c4112063b449fe0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:46:59 +0000 Subject: [PATCH 02/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- aggregate6.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aggregate6.spec b/aggregate6.spec index ce4729e..9f509c2 100644 --- a/aggregate6.spec +++ b/aggregate6.spec @@ -1,7 +1,7 @@ Summary: Tool to compress an unsorted list of IPv4 and IPv6 prefixes Name: aggregate6 Version: 1.0.12 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD-2-Clause URL: https://github.com/job/aggregate6 Source0: https://github.com/job/aggregate6/archive/%{version}/%{name}-%{version}.tar.gz @@ -90,6 +90,9 @@ PYTHONPATH=$RPM_BUILD_ROOT%{python3_sitelib} pytest-3 %license LICENSE %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1.0.12-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.0.12-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 3c05a35072e9c974621c66d1b06207f4b5aef3df Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 17 Jun 2024 22:51:18 +0200 Subject: [PATCH 03/13] Rebuilt for Python 3.13 --- aggregate6.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aggregate6.spec b/aggregate6.spec index 9f509c2..4c8bbf0 100644 --- a/aggregate6.spec +++ b/aggregate6.spec @@ -1,7 +1,7 @@ Summary: Tool to compress an unsorted list of IPv4 and IPv6 prefixes Name: aggregate6 Version: 1.0.12 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD-2-Clause URL: https://github.com/job/aggregate6 Source0: https://github.com/job/aggregate6/archive/%{version}/%{name}-%{version}.tar.gz @@ -90,6 +90,9 @@ PYTHONPATH=$RPM_BUILD_ROOT%{python3_sitelib} pytest-3 %license LICENSE %changelog +* Mon Jun 17 2024 Python Maint - 1.0.12-5 +- Rebuilt for Python 3.13 + * Mon Jan 22 2024 Fedora Release Engineering - 1.0.12-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 67fd386867eccd836ff1fe0da367a646ff6e95e0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:43:17 +0000 Subject: [PATCH 04/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- aggregate6.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aggregate6.spec b/aggregate6.spec index 4c8bbf0..161cc5a 100644 --- a/aggregate6.spec +++ b/aggregate6.spec @@ -1,7 +1,7 @@ Summary: Tool to compress an unsorted list of IPv4 and IPv6 prefixes Name: aggregate6 Version: 1.0.12 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD-2-Clause URL: https://github.com/job/aggregate6 Source0: https://github.com/job/aggregate6/archive/%{version}/%{name}-%{version}.tar.gz @@ -90,6 +90,9 @@ PYTHONPATH=$RPM_BUILD_ROOT%{python3_sitelib} pytest-3 %license LICENSE %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.0.12-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jun 17 2024 Python Maint - 1.0.12-5 - Rebuilt for Python 3.13 From 7f233a43af3249989bc130eb600b51f3fa6ed351 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Fri, 23 Aug 2024 17:43:02 +0200 Subject: [PATCH 05/13] Remove EPEL 7 build-time support --- aggregate6.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/aggregate6.spec b/aggregate6.spec index 161cc5a..1976515 100644 --- a/aggregate6.spec +++ b/aggregate6.spec @@ -25,7 +25,6 @@ Summary: Python module to compress an unsorted list of IPv4 and IPv6 pref BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: python%{python3_pkgversion}-py-radix >= 0.10.0 %{?python_provide:%python_provide python%{python3_pkgversion}-%{name}} -%{?el7:Requires:python%{python3_pkgversion}-py-radix >= 0.10.0} %endif %description -n python%{python3_pkgversion}-%{name} @@ -57,7 +56,6 @@ filters. %else %py3_install %{?el8:%py3_shebang_fix $RPM_BUILD_ROOT%{_bindir}/%{name}} -%{?el7:pathfix.py -pni "%{__python3} %{py3_shbang_opts}" $RPM_BUILD_ROOT%{_bindir}/%{name}} %endif # Correct man page installation path @@ -69,11 +67,7 @@ sed -e '1{\|^#![[:space:]]*/|d}' -i $RPM_BUILD_ROOT%{python3_sitelib}/%{name}/%{ touch -c -r %{name}/%{name}.py $RPM_BUILD_ROOT%{python3_sitelib}/%{name}/%{name}.py %check -%if 0%{?rhel} && 0%{?rhel} < 8 -PYTHONPATH=$RPM_BUILD_ROOT%{python3_sitelib} pytest-3 -%else %pytest -%endif %files %doc README.md From d86624d0371b394a2a16edd55f03616ac231c5c4 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Thu, 14 Nov 2024 00:55:34 +0100 Subject: [PATCH 06/13] Upgrade to 1.0.13 (#2325875) --- aggregate6-1.0.12-deprecated.patch | 40 ------------------------------ aggregate6.spec | 10 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 45 deletions(-) delete mode 100644 aggregate6-1.0.12-deprecated.patch diff --git a/aggregate6-1.0.12-deprecated.patch b/aggregate6-1.0.12-deprecated.patch deleted file mode 100644 index c78b546..0000000 --- a/aggregate6-1.0.12-deprecated.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b9571547316cf3d5b2f440d68f9f3fc99040dc0d Mon Sep 17 00:00:00 2001 -From: Robert Scheck -Date: Sat, 8 Oct 2022 20:53:47 +0200 -Subject: [PATCH] Don't require Python nose and mock - ---- - setup.py | 2 +- - tests/test_regression.py | 6 +++++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index b880f27..c14a6a9 100644 ---- a/setup.py -+++ b/setup.py -@@ -70,7 +70,7 @@ - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6' - ], -- setup_requires=["nose", "coverage", "mock"], -+ tests_require=["mock;python_version<'3.3'", "coverage"], - install_requires=["py-radix==0.10.0"] + ( - ["future", "ipaddress"] if sys.version_info.major == 2 else [] - ), -diff --git a/tests/test_regression.py b/tests/test_regression.py -index 8a71c7b..5f5e738 100644 ---- a/tests/test_regression.py -+++ b/tests/test_regression.py -@@ -4,7 +4,11 @@ - from aggregate6.aggregate6 import parse_args - from aggregate6.aggregate6 import main as agg_main - --from mock import patch -+try: -+ from unittest.mock import patch -+except ImportError: -+ from mock import patch -+ - import io - import sys - import unittest diff --git a/aggregate6.spec b/aggregate6.spec index 1976515..ed3ce38 100644 --- a/aggregate6.spec +++ b/aggregate6.spec @@ -1,12 +1,10 @@ Summary: Tool to compress an unsorted list of IPv4 and IPv6 prefixes Name: aggregate6 -Version: 1.0.12 -Release: 6%{?dist} +Version: 1.0.13 +Release: 1%{?dist} License: BSD-2-Clause URL: https://github.com/job/aggregate6 Source0: https://github.com/job/aggregate6/archive/%{version}/%{name}-%{version}.tar.gz -# Don't require Python nose and mock -Patch0: https://github.com/job/aggregate6/commit/b9571547316cf3d5b2f440d68f9f3fc99040dc0d.patch#/aggregate6-1.0.12-deprecated.patch BuildRequires: python%{python3_pkgversion}-devel # Tests BuildRequires: python%{python3_pkgversion}-pytest @@ -36,6 +34,7 @@ filters. %prep %autosetup -p1 +sed -e 's/"1.0.12"/"%{version}"/' -i %{name}/__init__.py %if 0%{?fedora} || 0%{?rhel} >= 9 %generate_buildrequires @@ -84,6 +83,9 @@ touch -c -r %{name}/%{name}.py $RPM_BUILD_ROOT%{python3_sitelib}/%{name}/%{name} %license LICENSE %changelog +* Thu Nov 14 2024 Robert Scheck 1.0.13-1 +- Upgrade to 1.0.13 (#2325875) + * Wed Jul 17 2024 Fedora Release Engineering - 1.0.12-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 4926e1c..1912582 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aggregate6-1.0.12.tar.gz) = 621a767939c6952f509a64adac83781ef967f4b30e76069c4fed07d9258f7a924049a2ffb4649fdda5fa1f536ca27b1f34a878c359d5699bb0324e96ae3ddc44 +SHA512 (aggregate6-1.0.13.tar.gz) = dc566ccc9203aec62050a06ea5246340c9541c5979ab665ae939da47f1a4d1031edf0329c7ec3874fa8c81a39b9a04357e343b36835940043d02c6be8035cd0b From 9ea1bc51e8145e8c8174483f97ac0bd0345a85d9 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Tue, 17 Dec 2024 22:22:09 +0100 Subject: [PATCH 07/13] Upgrade to 1.0.14 (#2332819) --- aggregate6.spec | 6 ++++-- sources | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/aggregate6.spec b/aggregate6.spec index ed3ce38..e4dd935 100644 --- a/aggregate6.spec +++ b/aggregate6.spec @@ -1,6 +1,6 @@ Summary: Tool to compress an unsorted list of IPv4 and IPv6 prefixes Name: aggregate6 -Version: 1.0.13 +Version: 1.0.14 Release: 1%{?dist} License: BSD-2-Clause URL: https://github.com/job/aggregate6 @@ -34,7 +34,6 @@ filters. %prep %autosetup -p1 -sed -e 's/"1.0.12"/"%{version}"/' -i %{name}/__init__.py %if 0%{?fedora} || 0%{?rhel} >= 9 %generate_buildrequires @@ -83,6 +82,9 @@ touch -c -r %{name}/%{name}.py $RPM_BUILD_ROOT%{python3_sitelib}/%{name}/%{name} %license LICENSE %changelog +* Tue Dec 17 2024 Robert Scheck 1.0.14-1 +- Upgrade to 1.0.14 (#2332819) + * Thu Nov 14 2024 Robert Scheck 1.0.13-1 - Upgrade to 1.0.13 (#2325875) diff --git a/sources b/sources index 1912582..ad582df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aggregate6-1.0.13.tar.gz) = dc566ccc9203aec62050a06ea5246340c9541c5979ab665ae939da47f1a4d1031edf0329c7ec3874fa8c81a39b9a04357e343b36835940043d02c6be8035cd0b +SHA512 (aggregate6-1.0.14.tar.gz) = 09c63b19068b63411b96b4c3f8982d4fc12f91dcab751bb52ab61606396f268183fb73fd2b5488e88b7fa1a07301bda6b73a44871c9967da2ddd3319f3fcaaac From d322e6edb1034980f44253fc906501af18ebb036 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:43:09 +0000 Subject: [PATCH 08/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- aggregate6.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aggregate6.spec b/aggregate6.spec index e4dd935..d0e758d 100644 --- a/aggregate6.spec +++ b/aggregate6.spec @@ -1,7 +1,7 @@ Summary: Tool to compress an unsorted list of IPv4 and IPv6 prefixes Name: aggregate6 Version: 1.0.14 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD-2-Clause URL: https://github.com/job/aggregate6 Source0: https://github.com/job/aggregate6/archive/%{version}/%{name}-%{version}.tar.gz @@ -82,6 +82,9 @@ touch -c -r %{name}/%{name}.py $RPM_BUILD_ROOT%{python3_sitelib}/%{name}/%{name} %license LICENSE %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.0.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Dec 17 2024 Robert Scheck 1.0.14-1 - Upgrade to 1.0.14 (#2332819) From a0afe27bbf6b0433f3439788b8eda9f6d6dee060 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 00:19:44 +0200 Subject: [PATCH 09/13] Rebuilt for Python 3.14 --- aggregate6.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aggregate6.spec b/aggregate6.spec index d0e758d..fdf7858 100644 --- a/aggregate6.spec +++ b/aggregate6.spec @@ -1,7 +1,7 @@ Summary: Tool to compress an unsorted list of IPv4 and IPv6 prefixes Name: aggregate6 Version: 1.0.14 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD-2-Clause URL: https://github.com/job/aggregate6 Source0: https://github.com/job/aggregate6/archive/%{version}/%{name}-%{version}.tar.gz @@ -82,6 +82,9 @@ touch -c -r %{name}/%{name}.py $RPM_BUILD_ROOT%{python3_sitelib}/%{name}/%{name} %license LICENSE %changelog +* Mon Jun 02 2025 Python Maint - 1.0.14-3 +- Rebuilt for Python 3.14 + * Thu Jan 16 2025 Fedora Release Engineering - 1.0.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 71c26bd7a16cdd736692d41abccd237dd23ee01a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:49:45 +0000 Subject: [PATCH 10/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- aggregate6.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aggregate6.spec b/aggregate6.spec index fdf7858..b5cfb45 100644 --- a/aggregate6.spec +++ b/aggregate6.spec @@ -1,7 +1,7 @@ Summary: Tool to compress an unsorted list of IPv4 and IPv6 prefixes Name: aggregate6 Version: 1.0.14 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD-2-Clause URL: https://github.com/job/aggregate6 Source0: https://github.com/job/aggregate6/archive/%{version}/%{name}-%{version}.tar.gz @@ -82,6 +82,9 @@ touch -c -r %{name}/%{name}.py $RPM_BUILD_ROOT%{python3_sitelib}/%{name}/%{name} %license LICENSE %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.0.14-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jun 02 2025 Python Maint - 1.0.14-3 - Rebuilt for Python 3.14 From a9326d65cbd5c89ac0917e0fa8dfe3291acff7ff Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:37:39 +0200 Subject: [PATCH 11/13] Rebuilt for Python 3.14.0rc2 bytecode --- aggregate6.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aggregate6.spec b/aggregate6.spec index b5cfb45..e90ea0f 100644 --- a/aggregate6.spec +++ b/aggregate6.spec @@ -1,7 +1,7 @@ Summary: Tool to compress an unsorted list of IPv4 and IPv6 prefixes Name: aggregate6 Version: 1.0.14 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD-2-Clause URL: https://github.com/job/aggregate6 Source0: https://github.com/job/aggregate6/archive/%{version}/%{name}-%{version}.tar.gz @@ -82,6 +82,9 @@ touch -c -r %{name}/%{name}.py $RPM_BUILD_ROOT%{python3_sitelib}/%{name}/%{name} %license LICENSE %changelog +* Fri Aug 15 2025 Python Maint - 1.0.14-5 +- Rebuilt for Python 3.14.0rc2 bytecode + * Wed Jul 23 2025 Fedora Release Engineering - 1.0.14-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From b2ab7d19924377c17086af07733b8db8def83e59 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:06:12 +0200 Subject: [PATCH 12/13] Rebuilt for Python 3.14.0rc3 bytecode --- aggregate6.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aggregate6.spec b/aggregate6.spec index e90ea0f..cf7a966 100644 --- a/aggregate6.spec +++ b/aggregate6.spec @@ -1,7 +1,7 @@ Summary: Tool to compress an unsorted list of IPv4 and IPv6 prefixes Name: aggregate6 Version: 1.0.14 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD-2-Clause URL: https://github.com/job/aggregate6 Source0: https://github.com/job/aggregate6/archive/%{version}/%{name}-%{version}.tar.gz @@ -82,6 +82,9 @@ touch -c -r %{name}/%{name}.py $RPM_BUILD_ROOT%{python3_sitelib}/%{name}/%{name} %license LICENSE %changelog +* Fri Sep 19 2025 Python Maint - 1.0.14-6 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 1.0.14-5 - Rebuilt for Python 3.14.0rc2 bytecode From 68824609b2f6c378da8dda1b40847904b1e354e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:31:03 +0000 Subject: [PATCH 13/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- aggregate6.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aggregate6.spec b/aggregate6.spec index cf7a966..3e10642 100644 --- a/aggregate6.spec +++ b/aggregate6.spec @@ -1,7 +1,7 @@ Summary: Tool to compress an unsorted list of IPv4 and IPv6 prefixes Name: aggregate6 Version: 1.0.14 -Release: 6%{?dist} +Release: 7%{?dist} License: BSD-2-Clause URL: https://github.com/job/aggregate6 Source0: https://github.com/job/aggregate6/archive/%{version}/%{name}-%{version}.tar.gz @@ -82,6 +82,9 @@ touch -c -r %{name}/%{name}.py $RPM_BUILD_ROOT%{python3_sitelib}/%{name}/%{name} %license LICENSE %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 1.0.14-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Sep 19 2025 Python Maint - 1.0.14-6 - Rebuilt for Python 3.14.0rc3 bytecode