From 2056651050292b0113dda5ae4f973ef128410ba9 Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Sat, 8 Feb 2025 13:30:42 +0200 Subject: [PATCH 01/10] Update the build process for tcl 9 / tk 9 --- PySolFC.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/PySolFC.spec b/PySolFC.spec index 78f6a1d..74fb10b 100644 --- a/PySolFC.spec +++ b/PySolFC.spec @@ -2,7 +2,7 @@ Name: PySolFC Version: 3.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A collection of solitaire card games License: GPL-2.0-or-later URL: https://pysolfc.sourceforge.io @@ -16,6 +16,8 @@ BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: desktop-file-utils BuildRequires: perl-interpreter +BuildRequires: tcl-devel < 1:9 +BuildRequires: tk-devel < 1:9 %if 0%{?fedora} # optional but nice to have but not available in any epel branch @@ -29,8 +31,8 @@ Requires: tile # used to get sound working with PulseAudio Requires: python%{python3_pkgversion}-pygame # really required -Requires: tcl -Requires: tk +Requires: tcl < 1:9 +Requires: tk < 1:9 Requires: tix Requires: python%{python3_pkgversion}-tkinter Requires: python%{python3_pkgversion}-imaging-tk @@ -88,6 +90,9 @@ find "$RPM_BUILD_ROOT%{python3_sitelib}/pysollib" -name '*.py' | xargs -L1 perl %changelog +* Sat Feb 08 2025 Shlomi Fish 3.2.0-3 +- Update the build process for tcl 9 / tk 9 + * Thu Jan 16 2025 Fedora Release Engineering - 3.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From cec72050b8af86755ca089b23ff4d5ca569f7cb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 11 Feb 2025 16:47:28 +0000 Subject: [PATCH 02/10] Modified packit just to trigger builds for pull requests --- .packit.yaml => packit.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) rename .packit.yaml => packit.yaml (74%) diff --git a/.packit.yaml b/packit.yaml similarity index 74% rename from .packit.yaml rename to packit.yaml index 927a968..7268bcf 100644 --- a/.packit.yaml +++ b/packit.yaml @@ -5,14 +5,20 @@ jobs: - job: pull_from_upstream trigger: release dist_git_branches: - - fedora-rawhide + rawhide: + fast_forward_merge_into: + - fedora-all + - epel-all + - job: koji_build trigger: commit - allowed_committers: + allowed_pr_authors: - all_admins + - packit dist_git_branches: - fedora-all - epel-all + - job: bodhi_update trigger: commit dist_git_branches: From 14d0a11568f2a75d27ac2cbc8f1252b7ec9ce4cc Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Tue, 18 Feb 2025 03:46:50 +0200 Subject: [PATCH 03/10] tcl/tk versions 9 --- PySolFC.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/PySolFC.spec b/PySolFC.spec index 74fb10b..0951b64 100644 --- a/PySolFC.spec +++ b/PySolFC.spec @@ -2,7 +2,7 @@ Name: PySolFC Version: 3.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A collection of solitaire card games License: GPL-2.0-or-later URL: https://pysolfc.sourceforge.io @@ -16,8 +16,8 @@ BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: desktop-file-utils BuildRequires: perl-interpreter -BuildRequires: tcl-devel < 1:9 -BuildRequires: tk-devel < 1:9 +BuildRequires: tcl-devel >= 1:9 +BuildRequires: tk-devel >= 1:9 %if 0%{?fedora} # optional but nice to have but not available in any epel branch @@ -31,8 +31,8 @@ Requires: tile # used to get sound working with PulseAudio Requires: python%{python3_pkgversion}-pygame # really required -Requires: tcl < 1:9 -Requires: tk < 1:9 +Requires: tcl >= 9 +Requires: tk >= 9 Requires: tix Requires: python%{python3_pkgversion}-tkinter Requires: python%{python3_pkgversion}-imaging-tk @@ -90,6 +90,10 @@ find "$RPM_BUILD_ROOT%{python3_sitelib}/pysollib" -name '*.py' | xargs -L1 perl %changelog +* Tue Feb 18 2025 Shlomi Fish 3.2.0-4 +- Trying to use tcl 9 / tk 9. +- rhbz#2344906 + * Sat Feb 08 2025 Shlomi Fish 3.2.0-3 - Update the build process for tcl 9 / tk 9 From 7bec96ecf1666a400745cde14a21e363e4002ecd Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Fri, 7 Mar 2025 10:30:15 +0200 Subject: [PATCH 04/10] Revert to use tcl 8 / tk 8 . --- PySolFC.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/PySolFC.spec b/PySolFC.spec index 0951b64..4ae5e61 100644 --- a/PySolFC.spec +++ b/PySolFC.spec @@ -2,7 +2,7 @@ Name: PySolFC Version: 3.2.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A collection of solitaire card games License: GPL-2.0-or-later URL: https://pysolfc.sourceforge.io @@ -16,8 +16,8 @@ BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: desktop-file-utils BuildRequires: perl-interpreter -BuildRequires: tcl-devel >= 1:9 -BuildRequires: tk-devel >= 1:9 +BuildRequires: tcl-devel < 1:9 +BuildRequires: tk-devel < 1:9 %if 0%{?fedora} # optional but nice to have but not available in any epel branch @@ -31,8 +31,8 @@ Requires: tile # used to get sound working with PulseAudio Requires: python%{python3_pkgversion}-pygame # really required -Requires: tcl >= 9 -Requires: tk >= 9 +# Requires: tcl >= 9 +# Requires: tk >= 9 Requires: tix Requires: python%{python3_pkgversion}-tkinter Requires: python%{python3_pkgversion}-imaging-tk @@ -90,6 +90,10 @@ find "$RPM_BUILD_ROOT%{python3_sitelib}/pysollib" -name '*.py' | xargs -L1 perl %changelog +* Fri Mar 07 2025 Shlomi Fish 3.2.0-5 +- Revert to use tcl 8 / tk 8 given that is what PySolFC loads in practice. +- rhbz#2344906 + * Tue Feb 18 2025 Shlomi Fish 3.2.0-4 - Trying to use tcl 9 / tk 9. - rhbz#2344906 From 87c799c7af1e739a42087375346fc02be18abd5e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 19:53:23 +0200 Subject: [PATCH 05/10] Rebuilt for Python 3.14 --- PySolFC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PySolFC.spec b/PySolFC.spec index 4ae5e61..eb94b66 100644 --- a/PySolFC.spec +++ b/PySolFC.spec @@ -2,7 +2,7 @@ Name: PySolFC Version: 3.2.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A collection of solitaire card games License: GPL-2.0-or-later URL: https://pysolfc.sourceforge.io @@ -90,6 +90,9 @@ find "$RPM_BUILD_ROOT%{python3_sitelib}/pysollib" -name '*.py' | xargs -L1 perl %changelog +* Mon Jun 02 2025 Python Maint - 3.2.0-6 +- Rebuilt for Python 3.14 + * Fri Mar 07 2025 Shlomi Fish 3.2.0-5 - Revert to use tcl 8 / tk 8 given that is what PySolFC loads in practice. - rhbz#2344906 From 49644a69945fcf49e8ac20039362bc8838b5fe36 Mon Sep 17 00:00:00 2001 From: Packit Date: Sun, 15 Jun 2025 01:28:30 +0000 Subject: [PATCH 06/10] Update to 3.4.0 upstream release - Resolves: rhbz#2372876 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + PySolFC.spec | 8 ++++++-- README.packit | 2 +- sources | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 093e7b4..ea43618 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ PySolFC-2.0.tar.bz2 /PySolFC-Cardsets--Minimal-3.0.0.tar.xz /PySolFC-3.1.0.tar.xz /PySolFC-3.2.0.tar.xz +/PySolFC-3.4.0.tar.xz diff --git a/PySolFC.spec b/PySolFC.spec index eb94b66..1b744eb 100644 --- a/PySolFC.spec +++ b/PySolFC.spec @@ -1,8 +1,8 @@ %global cardsets_minimal_ver 3.0.0 Name: PySolFC -Version: 3.2.0 -Release: 6%{?dist} +Version: 3.4.0 +Release: 1%{?dist} Summary: A collection of solitaire card games License: GPL-2.0-or-later URL: https://pysolfc.sourceforge.io @@ -90,6 +90,10 @@ find "$RPM_BUILD_ROOT%{python3_sitelib}/pysollib" -name '*.py' | xargs -L1 perl %changelog +* Sun Jun 15 2025 Packit - 3.4.0-1 +- Update to version 3.4.0 +- Resolves: rhbz#2372876 + * Mon Jun 02 2025 Python Maint - 3.2.0-6 - Rebuilt for Python 3.14 diff --git a/README.packit b/README.packit index 8c905b9..6beb40f 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.106.0.post1.dev8+g521f1e1d. +The file was generated using packit 1.8.0.post1.dev31+g9980e597. diff --git a/sources b/sources index d18d799..2536c04 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (PySolFC-3.2.0.tar.xz) = 190d20228585942ebf8be42514561a1642a2f102a4e32cf9e12d5b429f34279a447268839156d1e153be2147c152d738065bdbbc79d6494cfb9b5dcc901630d9 +SHA512 (PySolFC-3.4.0.tar.xz) = 208e301cd8f8467e5078aace219a729097a851f09cd47d12ee9723e5b2127e951dfe779704ad0dedacd94c2a9a18553fcc06de8fa426d27a6794eb0d15ff128f SHA512 (PySolFC-Cardsets--Minimal-3.0.0.tar.xz) = 9d4bacd072b450b29b9f1bec4557121a3647c2f837aeb6e249f452cb886467c5e7ca36dd36a78ea69a5c9df6f30d5245e12681d9d02fc9da2ece09c25d77e787 From b532864956c23274018e11529ec4d4a3cb711eb7 Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Fri, 11 Jul 2025 07:42:17 +0300 Subject: [PATCH 07/10] pyprojectize ; rhbz#2379434 rhbz#2377406 --- PySolFC.spec | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/PySolFC.spec b/PySolFC.spec index 1b744eb..0021bfe 100644 --- a/PySolFC.spec +++ b/PySolFC.spec @@ -2,7 +2,7 @@ Name: PySolFC Version: 3.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A collection of solitaire card games License: GPL-2.0-or-later URL: https://pysolfc.sourceforge.io @@ -13,7 +13,6 @@ Patch0: PySolFC-desktop-exec.patch BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: desktop-file-utils BuildRequires: perl-interpreter BuildRequires: tcl-devel < 1:9 @@ -36,7 +35,6 @@ Requires: python%{python3_pkgversion}-pygame Requires: tix Requires: python%{python3_pkgversion}-tkinter Requires: python%{python3_pkgversion}-imaging-tk -Requires: python%{python3_pkgversion}-random2 %if 0%{?fedora} || 0%{?rhel} > 7 Recommends: PySolFC-cardsets Recommends: PySolFC-music @@ -52,18 +50,21 @@ Provides: pysol = %{version}-%{release} %description %{name} is a collection of more than 1000 solitaire card games. It is a fork of PySol solitaire. Its features include modern look and feel (uses Tile widget -set), multiple cardsets and tableau backgrounds, sound, unlimited undo, player +set), multiple card-sets and tableau backgrounds, sound, unlimited undo, player statistics, a hint system, demo games, a solitaire wizard, support for user written plug-ins, an integrated HTML help browser, and lots of documentation. %prep %autosetup -p1 -a2 +%generate_buildrequires +%pyproject_buildrequires + %build -%py3_build +%pyproject_wheel %install -%py3_install +%pyproject_install # install desktop file desktop-file-install \ --delete-original \ @@ -82,7 +83,7 @@ find "$RPM_BUILD_ROOT%{python3_sitelib}/pysollib" -name '*.py' | xargs -L1 perl %license COPYING %doc README.md %{python3_sitelib}/pysollib -%{python3_sitelib}/*egg-info +%{python3_sitelib}/*dist-info %{_bindir}/pysol %{_datadir}/%{name} %{_datadir}/icons/hicolor/*/apps/*.png @@ -90,6 +91,12 @@ find "$RPM_BUILD_ROOT%{python3_sitelib}/pysollib" -name '*.py' | xargs -L1 perl %changelog +* Fri Jul 11 2025 Shlomi Fish 3.4.0-2 +- Remove unused / unavailable deps ( eg - python3-random2 ) +- Use pyprojectize/etc. to modernize the .spec +- rhbz#2379434 +- rhbz#2377406 + * Sun Jun 15 2025 Packit - 3.4.0-1 - Update to version 3.4.0 - Resolves: rhbz#2372876 From 340f4dbceda34880be0ef4f8f3cc8130493a9880 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 15:56:17 +0000 Subject: [PATCH 08/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- PySolFC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PySolFC.spec b/PySolFC.spec index 0021bfe..a5a5154 100644 --- a/PySolFC.spec +++ b/PySolFC.spec @@ -2,7 +2,7 @@ Name: PySolFC Version: 3.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A collection of solitaire card games License: GPL-2.0-or-later URL: https://pysolfc.sourceforge.io @@ -91,6 +91,9 @@ find "$RPM_BUILD_ROOT%{python3_sitelib}/pysollib" -name '*.py' | xargs -L1 perl %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 3.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jul 11 2025 Shlomi Fish 3.4.0-2 - Remove unused / unavailable deps ( eg - python3-random2 ) - Use pyprojectize/etc. to modernize the .spec From 32e35bb20eac2264949be1d1c24b7fd5f7ff3123 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 13:09:48 +0200 Subject: [PATCH 09/10] Rebuilt for Python 3.14.0rc2 bytecode --- PySolFC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PySolFC.spec b/PySolFC.spec index a5a5154..880e255 100644 --- a/PySolFC.spec +++ b/PySolFC.spec @@ -2,7 +2,7 @@ Name: PySolFC Version: 3.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A collection of solitaire card games License: GPL-2.0-or-later URL: https://pysolfc.sourceforge.io @@ -91,6 +91,9 @@ find "$RPM_BUILD_ROOT%{python3_sitelib}/pysollib" -name '*.py' | xargs -L1 perl %changelog +* Fri Aug 15 2025 Python Maint - 3.4.0-4 +- Rebuilt for Python 3.14.0rc2 bytecode + * Wed Jul 23 2025 Fedora Release Engineering - 3.4.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 2ec9ab7051244e139675cf8a3cdad21345799dea Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:40:47 +0200 Subject: [PATCH 10/10] Rebuilt for Python 3.14.0rc3 bytecode --- PySolFC.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PySolFC.spec b/PySolFC.spec index 880e255..53e7ac2 100644 --- a/PySolFC.spec +++ b/PySolFC.spec @@ -2,7 +2,7 @@ Name: PySolFC Version: 3.4.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A collection of solitaire card games License: GPL-2.0-or-later URL: https://pysolfc.sourceforge.io @@ -91,6 +91,9 @@ find "$RPM_BUILD_ROOT%{python3_sitelib}/pysollib" -name '*.py' | xargs -L1 perl %changelog +* Fri Sep 19 2025 Python Maint - 3.4.0-5 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 3.4.0-4 - Rebuilt for Python 3.14.0rc2 bytecode