diff --git a/.gitignore b/.gitignore index 02f725a..432aa76 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,3 @@ /ydiff-1.3.tar.gz /ydiff-1.4.1.tar.gz /ydiff-1.4.2.tar.gz -/ydiff-1.5.tar.gz diff --git a/changelog b/changelog deleted file mode 100644 index 8aa9bcc..0000000 --- a/changelog +++ /dev/null @@ -1,101 +0,0 @@ -* Mon Dec 15 2025 Alois Mahdal 1.5-2 -- Rebuilt to propagate typo fix in changelog - -* Mon Dec 15 2025 Alois Mahdal 1.5-1 -- Updated to 1.5 (RHBZ#2419728) - -* Fri Sep 19 2025 Python Maint - 1.4.2-6 -- Rebuilt for Python 3.14.0rc3 bytecode - -* Fri Aug 15 2025 Python Maint - 1.4.2-5 -- Rebuilt for Python 3.14.0rc2 bytecode - -* Fri Jul 25 2025 Fedora Release Engineering - 1.4.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon Jun 02 2025 Python Maint - 1.4.2-3 -- Rebuilt for Python 3.14 - -* Sun Jan 19 2025 Fedora Release Engineering - 1.4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Dec 13 2024 Alois Mahdal 1.4.2-1 -- Updated to 1.4.2 (RHBZ#2326989) - -* Thu Nov 14 2024 Alois Mahdal 1.4.1-1 -- Updated to 1.4.1 (RHBZ#2326169) - -* Wed Sep 04 2024 Miroslav Suchý - 1.3-4 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Jun 07 2024 Python Maint - 1.3-2 -- Rebuilt for Python 3.13 - -* Fri Apr 05 2024 Alois Mahdal 1.3-1 -- Updated to 1.3 - -* Sat Jan 27 2024 Fedora Release Engineering - 1.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jun 13 2023 Python Maint - 1.2-9 -- Rebuilt for Python 3.12 - -* Sat Jan 21 2023 Fedora Release Engineering - 1.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 13 2022 Python Maint - 1.2-6 -- Rebuilt for Python 3.11 - -* Sat Jan 22 2022 Fedora Release Engineering - 1.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 1.2-3 -- Rebuilt for Python 3.10 - -* Thu Jan 28 2021 Fedora Release Engineering - 1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Oct 29 2020 Alois Mahdal - 1.2-1 -- Updated upstream to 1.2 - -* Wed Jul 29 2020 Fedora Release Engineering - 1.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 26 2020 Miro Hrončok - 1.1-9 -- Rebuilt for Python 3.9 - -* Fri Jan 31 2020 Fedora Release Engineering - 1.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Oct 03 2019 Miro Hrončok - 1.1-7 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Mon Aug 19 2019 Miro Hrončok - 1.1-6 -- Rebuilt for Python 3.8 - -* Sat Jul 27 2019 Fedora Release Engineering - 1.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Jul 02 2018 Miro Hrončok - 1.1-2 -- Rebuilt for Python 3.7 - -* Thu Jun 28 2018 Alois Mahdal 1.1-1 -- Initial packaging. diff --git a/sources b/sources index 232b5ce..6ac7e4f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ydiff-1.5.tar.gz) = 9b2b00fde08f3467dfa063d0ae184760ead4055ddd6815cbc5543aceca1a2e8ad0c1506fc7af45961cec2eb8c3f8ae60b4753c90882c22657492a40560346b3a +SHA512 (ydiff-1.4.2.tar.gz) = 8aa0cd510cab0ad73b7f99f566aedbf30929fe9d98a7675a9c271b659bec93a3fced19dc661b0018c99279cf9b1b7fd42c70d5401a348b4b3f614f3be1bec832 diff --git a/ydiff.spec b/ydiff.spec index 424121f..35cb6d1 100644 --- a/ydiff.spec +++ b/ydiff.spec @@ -1,12 +1,13 @@ Name: ydiff -Version: 1.5 -Release: %autorelease +Version: 1.4.2 +Release: 6%{?dist} Summary: View colored, incremental diff URL: https://github.com/ymattw/ydiff -License: BSD-3-Clause +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD Source0: https://github.com/ymattw/ydiff/archive/%{version}/%{name}-%{version}.tar.gz -BuildRequires: pyproject-rpm-macros BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: less BuildArch: noarch @@ -19,35 +20,128 @@ a version-controlled workspace or from stdin, in side-by-side (similar to %package -n python3-%{name} Summary: %{summary} +%{?python_provide:%python_provide python3-%{name}} %description -n python3-%{name} Python library that implements API used by ydiff tool. %prep %autosetup -n %{name}-%{version} /usr/bin/sed -i '/#!\/usr\/bin\/env python/d' ydiff.py -%generate_buildrequires -%pyproject_buildrequires %build -%pyproject_wheel +%py3_build %check tests/regression.sh -%pyproject_check_import - # upstream pipeline uses `make test` which also has coverage # and linters but we don't do those here %install -%pyproject_install -%pyproject_save_files %{name} +%py3_install %files %doc README.rst %license LICENSE %{_bindir}/ydiff -%files -n python3-%{name} -f %{pyproject_files} +%files -n python3-%{name} +%{python3_sitelib}/__pycache__/* +%{python3_sitelib}/%{name}.py +%{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info %changelog -%autochangelog +* Fri Sep 19 2025 Python Maint - 1.4.2-6 +- Rebuilt for Python 3.14.0rc3 bytecode + +* Fri Aug 15 2025 Python Maint - 1.4.2-5 +- Rebuilt for Python 3.14.0rc2 bytecode + +* Fri Jul 25 2025 Fedora Release Engineering - 1.4.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Mon Jun 02 2025 Python Maint - 1.4.2-3 +- Rebuilt for Python 3.14 + +* Sun Jan 19 2025 Fedora Release Engineering - 1.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Dec 13 2024 Alois Mahdal 1.4.2-1 +- Updated to 1.4.2 (RHBZ#2326989) + +* Thu Nov 14 2024 Alois Mahdal 1.4.1-1 +- Updated to 1.4.1 (RHBZ#2326169) + +* Wed Sep 04 2024 Miroslav Suchý - 1.3-4 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jun 07 2024 Python Maint - 1.3-2 +- Rebuilt for Python 3.13 + +* Fri Apr 05 2024 Alois Mahdal 1.3-1 +- Updated to 1.3 + +* Sat Jan 27 2024 Fedora Release Engineering - 1.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 1.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 1.2-9 +- Rebuilt for Python 3.12 + +* Sat Jan 21 2023 Fedora Release Engineering - 1.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 1.2-6 +- Rebuilt for Python 3.11 + +* Sat Jan 22 2022 Fedora Release Engineering - 1.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 1.2-3 +- Rebuilt for Python 3.10 + +* Thu Jan 28 2021 Fedora Release Engineering - 1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Oct 29 2020 Alois Mahdal - 1.2-1 +- Updated upstream to 1.2 + +* Wed Jul 29 2020 Fedora Release Engineering - 1.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 1.1-9 +- Rebuilt for Python 3.9 + +* Fri Jan 31 2020 Fedora Release Engineering - 1.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Oct 03 2019 Miro Hrončok - 1.1-7 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Mon Aug 19 2019 Miro Hrončok - 1.1-6 +- Rebuilt for Python 3.8 + +* Sat Jul 27 2019 Fedora Release Engineering - 1.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jul 02 2018 Miro Hrončok - 1.1-2 +- Rebuilt for Python 3.7 + +* Thu Jun 28 2018 Alois Mahdal 1.1-1 +- Initial packaging.