diff --git a/.gitignore b/.gitignore index c6393d7..30e7764 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,9 @@ /2ping-2.0.tar.gz /2ping-3.2.0.tar.gz /2ping-3.2.1.tar.gz +/2ping-4.1.tar.gz +/2ping-4.3.tar.gz +/2ping-4.4.tar.gz +/2ping-4.4.1.tar.gz +/2ping-4.5.tar.gz +/2ping-4.5.1.tar.gz diff --git a/2ping.spec b/2ping.spec index 1eddbb9..fe287eb 100644 --- a/2ping.spec +++ b/2ping.spec @@ -1,86 +1,57 @@ -%if 0%{?rhel} -%global with_python3 0 -%{!?__python2: %global __python2 /usr/bin/python2} -%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%{!?py2_build: %global py2_build %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} build --executable="%{__python2} -s"}} -%{!?py2_install: %global py2_install %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} install -O1 --skip-build --root %{buildroot}}} -%endif - Name: 2ping -Version: 3.2.1 -Release: 2%{?dist} +Version: 4.5.1 +Release: %autorelease Summary: Bi-directional ping utility -License: GPLv2+ -URL: http://www.finnie.org/software/2ping -Source0: http://www.finnie.org/software/%{name}/%{name}-%{version}.tar.gz +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later +URL: https://www.finnie.org/software/2ping +Source0: https://www.finnie.org/software/%{name}/%{name}-%{version}.tar.gz BuildArch: noarch -BuildRequires: python2-devel -BuildRequires: python-setuptools -%{?python_provide:%python_provide python2-%{name}} +BuildRequires: python3-devel +BuildRequires: python3-pytest +BuildRequires: systemd %description -2ping is a bi-directional ping utility. It uses 3-way pings (akin to TCP SYN, +2ping is a bi-directional ping utility. It uses 3-way pings (akin to TCP SYN, SYN/ACK, ACK) and after-the-fact state comparison between a 2ping listener and a 2ping client to determine which direction packet loss occurs. %prep -%setup -n %{name}-%{version} +%autosetup + +%generate_buildrequires +%pyproject_buildrequires %build -%py2_build +%pyproject_wheel %install -%py2_install -install -d -m 0755 %{buildroot}/usr/share/man/man1 -install -m 0644 doc/2ping.1 %{buildroot}/usr/share/man/man1/2ping.1 -install -m 0644 doc/2ping.1 %{buildroot}/usr/share/man/man1/2ping6.1 +%pyproject_install +%pyproject_save_files -l '*' +install -Dp -m 0644 2ping.service %{buildroot}/%{_unitdir}/2ping.service +install -Dp -m 0644 doc/2ping.1 %{buildroot}/%{_mandir}/man1/2ping.1 +install -Dp -m 0644 doc/2ping.1 %{buildroot}/%{_mandir}/man1/2ping6.1 %check -%{__python2} setup.py test +%pyproject_check_import +%{__python3} -mpytest -%files -%doc ChangeLog COPYING README -%{python2_sitelib}/* -%{_bindir}/2ping -%{_bindir}/2ping6 -%{_mandir}/man1/2ping.1* -%{_mandir}/man1/2ping6.1* +%post +%systemd_post 2ping.service + +%preun +%systemd_preun 2ping.service + +%postun +%systemd_postun 2ping.service + +%files -f %{pyproject_files} +%doc ChangeLog.md README.md +%{_bindir}/%{name} +%{_bindir}/%{name}6 +%{_mandir}/man1/%{name}.1* +%{_mandir}/man1/%{name}6.1* +%{_unitdir}/2ping.service %changelog -* Sat Mar 26 2016 Fabio Alessandro Locati - 3.2.1-1 -- Update to 3.2.1 - -* Tue Mar 01 2016 Fabio Alessandro Locati - 3.2.0-2 -- Fix for EL6 and EPEL7 -- Cleanup the SPEC file - -* Tue Mar 01 2016 Fabio Alessandro Locati - 3.2.0-1 -- Update to 3.2.0 - -* Tue Mar 01 2016 Ryan Finnie - 3.1.0-1 -- Update to 3.1.0 (#1275261) - -* Wed Feb 03 2016 Fedora Release Engineering - 2.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jun 16 2015 Fedora Release Engineering - 2.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Jun 03 2015 Jitka Plesnikova - 2.0-6 -- Perl 5.22 rebuild - -* Wed Aug 27 2014 Jitka Plesnikova - 2.0-5 -- Perl 5.20 rebuild - -* Fri Jun 06 2014 Fedora Release Engineering - 2.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Jun 06 2014 Fedora Release Engineering - 2.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Aug 13 2013 Christopher Meng - 2.0-2 -- Perl 5.18 Rebuild. - -* Thu May 17 2012 Christopher Meng - 2.0-1 -- Initial Package. +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..c14d4ca --- /dev/null +++ b/changelog @@ -0,0 +1,161 @@ +* Mon Nov 03 2025 Filipe Rosset - 4.5.1-21 +- Spec cleanup and modernization fixes rhbz#2378513 + +* Fri Sep 19 2025 Python Maint - 4.5.1-20 +- Rebuilt for Python 3.14.0rc3 bytecode + +* Fri Aug 15 2025 Python Maint - 4.5.1-19 +- Rebuilt for Python 3.14.0rc2 bytecode + +* Wed Jul 23 2025 Fedora Release Engineering - 4.5.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Mon Jun 02 2025 Python Maint - 4.5.1-17 +- Rebuilt for Python 3.14 + +* Mon Jan 20 2025 Fedora Release Engineering - 4.5.1-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jan 16 2025 Fedora Release Engineering - 4.5.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Jul 26 2024 Miroslav Suchý - 4.5.1-14 +- convert license to SPDX + +* Wed Jul 17 2024 Fedora Release Engineering - 4.5.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jun 07 2024 Python Maint - 4.5.1-12 +- Rebuilt for Python 3.13 + +* Mon Jan 29 2024 Fedora Release Engineering - 4.5.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 4.5.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 4.5.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jan 18 2024 Fedora Release Engineering - 4.5.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 4.5.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 4.5.1-6 +- Rebuilt for Python 3.12 + +* Wed Jan 18 2023 Fedora Release Engineering - 4.5.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 4.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 4.5.1-3 +- Rebuilt for Python 3.11 + +* Wed Jan 19 2022 Fedora Release Engineering - 4.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sat Jan 15 2022 Fabio Alessandro Locati - 4.5.1-1 +- Update to 4.5.1 + +* Wed Jul 21 2021 Fedora Release Engineering - 4.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 4.5-4 +- Rebuilt for Python 3.10 + +* Mon Jan 25 2021 Fedora Release Engineering - 4.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 4.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jun 18 2020 Ryan Finnie - 4.5-1 +- Update to 4.5 +- Install supplied systemd 2ping.service +- Use pytest for test suite + +* Tue May 26 2020 Miro Hrončok - 4.3-7 +- Rebuilt for Python 3.9 + +* Tue Jan 28 2020 Fedora Release Engineering - 4.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Oct 03 2019 Miro Hrončok - 4.3-5 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Mon Aug 19 2019 Miro Hrončok - 4.3-4 +- Rebuilt for Python 3.8 + +* Wed Jul 24 2019 Fedora Release Engineering - 4.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Jul 19 2019 Filipe Rosset - 4.3-2 +- Spec cleanup and modernization, thanks to Fabian Affolter (fab) + +* Thu Jul 18 2019 Filipe Rosset - 4.3-1 +- Update to 4.3 (thanks to Ryan Finnie) fixes rhbz#1473919 + +* Thu Jan 31 2019 Fedora Release Engineering - 4.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 4.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 4.1-3 +- Rebuilt for Python 3.7 + +* Wed Feb 07 2018 Fedora Release Engineering - 4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 24 2017 Fabio Alessandro Locati - 4.1-1 +- Update to 4.1 + +* Wed Jul 26 2017 Fedora Release Engineering - 3.2.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 3.2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jul 19 2016 Fedora Release Engineering - 3.2.1-3 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Sat Mar 26 2016 Fabio Alessandro Locati - 3.2.1-1 +- Update to 3.2.1 + +* Tue Mar 01 2016 Fabio Alessandro Locati - 3.2.0-2 +- Fix for EL6 and EPEL7 +- Cleanup the SPEC file + +* Tue Mar 01 2016 Fabio Alessandro Locati - 3.2.0-1 +- Update to 3.2.0 + +* Tue Mar 01 2016 Ryan Finnie - 3.1.0-1 +- Update to 3.1.0 (#1275261) + +* Wed Feb 03 2016 Fedora Release Engineering - 2.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Jun 16 2015 Fedora Release Engineering - 2.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Jun 03 2015 Jitka Plesnikova - 2.0-6 +- Perl 5.22 rebuild + +* Wed Aug 27 2014 Jitka Plesnikova - 2.0-5 +- Perl 5.20 rebuild + +* Fri Jun 06 2014 Fedora Release Engineering - 2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Jun 06 2014 Fedora Release Engineering - 2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Aug 13 2013 Christopher Meng - 2.0-2 +- Perl 5.18 Rebuild. + +* Thu May 17 2012 Christopher Meng - 2.0-1 +- Initial Package. diff --git a/sources b/sources index a487712..446db50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -493da290b39cc055d1c095bf3bc8418a 2ping-3.2.1.tar.gz +SHA512 (2ping-4.5.1.tar.gz) = 13ab8c34d6b4e8d53bc0f1c33afa1c71bf61313d29350d2211a44557b244062cb090cf5d66cc6eed58f9f4c41a667bb24a8c1155243864e8343c741770b60cd6