Rebuilt for Python 3.14.0rc3 bytecode

- Resolves: rhbz#2372876

Commit authored by Packit automation (https://packit.dev/)

.gitignore

@@ -1,3 +1,21 @@
 PySolFC-2.0.tar.bz2
 /PySolFC-2.6.4.tar.xz
 /PySolFC-Cardsets--Minimal-2.0.tar.xz
+/PySolFC-2.8.0.tar.xz
+/PySolFC-2.10.0.tar.xz
+/PySolFC-2.12.0.tar.xz
+/PySolFC-Cardsets--Minimal-2.0.2.tar.xz
+/PySolFC-2.14.0.tar.xz
+/PySolFC-2.14.1.tar.xz
+/PySolFC-2.15.0.tar.xz
+/PySolFC-Cardsets--Minimal-2.1.0.tar.xz
+/PySolFC-2.18.0.tar.xz
+/PySolFC-2.20.0.tar.xz
+/PySolFC-2.20.1.tar.xz
+/PySolFC-Cardsets--Minimal-2.2.0.tar.xz
+/PySolFC-2.21.0.tar.xz
+/PySolFC-3.0.0.tar.xz
+/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

PySolFC-desktop-exec.patch

@@ -1,11 +1,11 @@
---- data/pysol.desktop.orig	2010-02-22 21:36:45.355136299 -0500
-+++ data/pysol.desktop	2010-02-22 21:36:52.171434787 -0500
+--- PySolFC-2.8.0/data/pysol.desktop.orig	2020-03-20 10:25:30.037977009 +0200
++++ PySolFC-2.8.0/data/pysol.desktop	2020-03-20 10:25:37.655003734 +0200
 @@ -1,7 +1,7 @@
  [Desktop Entry]
- Encoding=UTF-8
  Name=PySol Fan Club Edition
+ Comment=More than 1000 solitaire card games
 -Exec=pysol.py
 +Exec=pysol
+ StartupWMClass=Pysol
  Terminal=false
  Type=Application
- Categories=Game;CardGame;

PySolFC-pycotap_not_required_to_run.patch

@@ -0,0 +1,12 @@
+pycotap is only needed for the single unittest , tap_unittests.py
+
+--- ./setup.py.orig	2023-12-01 18:05:30.725608311 +0000
++++ ./setup.py	2023-12-01 18:05:46.564570718 +0000
+@@ -74,7 +74,6 @@ kw = {
+     'install_requires': [
+         'attrs>=18.2.0',
+         'configobj',
+-        'pycotap',
+         'pysol_cards',
+         'random2',
+         'six',

PySolFC.spec

@@ -1,56 +1,72 @@
+%global cardsets_minimal_ver 3.0.0
+
 Name:           PySolFC
-Version:        2.6.4
-Release:        4%{?dist}
-Summary:        A collection of solitare card games
-License:        GPLv2+
+Version:        3.4.0
+Release:        5%{?dist}
+Summary:        A collection of solitaire card games
+License:        GPL-2.0-or-later
 URL:            https://pysolfc.sourceforge.io
 Source0:        https://downloads.sourceforge.net/pysolfc/%{name}-%{version}.tar.xz
 Source1:        pysol-start-script
-Source2:        PySolFC-Cardsets--Minimal-2.0.tar.xz
+Source2:        https://downloads.sourceforge.net/pysolfc/PySolFC-Cardsets--Minimal-%{cardsets_minimal_ver}.tar.xz
 Patch0:         PySolFC-desktop-exec.patch
 BuildArch:      noarch
 
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  desktop-file-utils
-# optional but nice to have
-Requires:       python3-imaging
+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
+# freecell-solver already requires libsfreecell-solver
+Recommends:     freecell-solver
+Recommends:     python%{python3_pkgversion}-freecell_solver
+%endif
+
+Requires:       python%{python3_pkgversion}-imaging
 Requires:       tile
 # used to get sound working with PulseAudio
-Requires:       python3-pygame
+Requires:       python%{python3_pkgversion}-pygame
 # really required
-Requires:       tcl
-Requires:       tk
+# Requires:       tcl >= 9
+# Requires:       tk >= 9
 Requires:       tix
-Requires:       python3-tkinter
-Requires:       python3-imaging-tk
-Requires:       python3-random2
+Requires:       python%{python3_pkgversion}-tkinter
+Requires:       python%{python3_pkgversion}-imaging-tk
 %if 0%{?fedora} || 0%{?rhel} > 7
 Recommends:     PySolFC-cardsets
 Recommends:     PySolFC-music
+%else
+# el7 doesn't detect these dependencies
+Requires:       python%{python3_pkgversion}-pysol-cards
+Requires:       python3-configobj
+Requires:       python36-attrs
 %endif
+
 Provides:       pysol = %{version}-%{release}
 
 %description
 %{name} is a collection of more than 1000 solitaire card games. It is a fork
-of PySol solitare. Its features include modern look and feel (uses Tile widget
-set), multiple cardsets and tableau backgrounds, sound, unlimited undo, player
+of PySol solitaire. Its features include modern look and feel (uses Tile widget
+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
-%setup -q -a2
-%patch0 -p0 -b .desktop-exec
+%autosetup -p1 -a2
+
+%generate_buildrequires
+%pyproject_buildrequires
 
 %build
-%py3_build
+%pyproject_wheel
 
 %install
-%py3_install
+%pyproject_install
 # install desktop file
 desktop-file-install \
-%if 0%{?fedora} && 0%{?fedora} < 19
-    --vendor="fedora" \
-%endif
     --delete-original \
     --dir=$RPM_BUILD_ROOT/%{_datadir}/applications \
     $RPM_BUILD_ROOT/%{_datadir}/applications/pysol.desktop
@@ -58,7 +74,8 @@ desktop-file-install \
 # install the startup wrapper
 mv $RPM_BUILD_ROOT%{_bindir}/pysol.py $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/pysol
-cp -a PySolFC-Cardsets--Minimal-2.0/cardset-* $RPM_BUILD_ROOT%{_datadir}/PySolFC
+cp -a PySolFC-Cardsets--Minimal-%{cardsets_minimal_ver}/cardset-* $RPM_BUILD_ROOT%{_datadir}/PySolFC
+find "$RPM_BUILD_ROOT%{python3_sitelib}/pysollib" -name '*.py' | xargs -L1 perl -ln -i -E 'say if (not (($. == 1) and (m&^#![ \t]*/usr/&)))'
 
 %find_lang pysol
 
@@ -66,15 +83,175 @@ cp -a PySolFC-Cardsets--Minimal-2.0/cardset-* $RPM_BUILD_ROOT%{_datadir}/PySolFC
 %license COPYING
 %doc README.md
 %{python3_sitelib}/pysollib
-%{python3_sitelib}/*egg-info
+%{python3_sitelib}/*dist-info
 %{_bindir}/pysol
 %{_datadir}/%{name}
-%{_datadir}/pixmaps/*
-%{_datadir}/icons/*.png
+%{_datadir}/icons/hicolor/*/apps/*.png
 %{_datadir}/applications/*.desktop
 
 
 %changelog
+* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 3.4.0-5
+- Rebuilt for Python 3.14.0rc3 bytecode
+
+* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 3.4.0-4
+- Rebuilt for Python 3.14.0rc2 bytecode
+
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Fri Jul 11 2025 Shlomi Fish <shlomif@shlomifish.org> 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 <hello@packit.dev> - 3.4.0-1
+- Update to version 3.4.0
+- Resolves: rhbz#2372876
+
+* Mon Jun 02 2025 Python Maint <python-maint@redhat.com> - 3.2.0-6
+- Rebuilt for Python 3.14
+
+* Fri Mar 07 2025 Shlomi Fish <shlomif@shlomifish.org> 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 <shlomif@shlomifish.org> 3.2.0-4
+- Trying to use tcl 9 / tk 9.
+- rhbz#2344906
+
+* Sat Feb 08 2025 Shlomi Fish <shlomif@shlomifish.org> 3.2.0-3
+- Update the build process for tcl 9 / tk 9
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sat Jan 11 2025 Packit <hello@packit.dev> - 3.2.0-1
+- Update to version 3.2.0
+- Resolves: rhbz#2337163
+
+* Mon Oct 21 2024 Packit <hello@packit.dev> - 3.1.0-1
+- Update to version 3.1.0
+- Resolves: rhbz#2319948
+
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 3.0.0-2
+- Rebuilt for Python 3.13
+
+* Mon Jun 03 2024 Shlomi Fish <shlomif@shlomifish.org> 3.0.0-1
+- New upstream versions (of both "PySolFC" and "PySolFC-Cardsets--Minimal").
+  pycotap patch is no longer needed so remove.
+
+* Sun Mar 03 2024 Sérgio Basto <sergio@serjux.com> - 2.21.0-6
+- py3_shebang_fix is not needed and fix epel-7 build
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.21.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.21.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Dec 01 2023 Sérgio Basto <sergio@serjux.com> - 2.21.0-3
+- Do not require pycotap to run PySol, pycotap is only needed for the single
+  unittest ( https://github.com/shlomif/PySolFC/pull/353 )
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.21.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Jul 12 2023 Shlomi Fish <shlomif@shlomifish.org> 2.21.0-1
+- Update PySolFC to 2.21.0.
+
+* Sat Jun 24 2023 Sérgio Basto <sergio@serjux.com> - 2.20.1-4
+- Migrate to SPDX license format
+
+* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 2.20.1-3
+- Rebuilt for Python 3.12
+
+* Thu May 18 2023 Sérgio Basto <sergio@serjux.com> - 2.20.1-2
+- Update cardsets_minimal_ver to 2.2.0
+
+* Tue Feb 28 2023 Shlomi Fish <shlomif@shlomifish.org> 2.20.0-1
+- Update PySolFC to 2.20.0.
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Oct 12 2022 Shlomi Fish <shlomif@shlomifish.org> 2.18.0-1
+- Update PySolFC to 2.18.0.
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 2.15.0-3
+- Rebuilt for Python 3.11
+
+* Wed May 04 2022 Sérgio Basto <sergio@serjux.com> - 2.15.0-2
+- Fix install on EL where we don't have freecell-solver
+
+* Fri Apr 08 2022 Sérgio Basto <sergio@serjux.com> - 2.15.0-1
+- Update PySolFC to 2.15.0 (#2063446)
+- Update Cardsets Minimal to 2.1.0
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Sat Dec 11 2021 Shlomi Fish <shlomif@shlomifish.org> 2.14.1-1
+- Update to 2.14.1 (#2031331)
+
+* Sun Sep 19 2021 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 2.14.0-1
+- Update to 2.14.0 (#2005720)
+
+* Thu Aug 12 2021 Sérgio Basto <sergio@serjux.com> - 2.12.0-1
+- Update to 2.12.0
+
+* Thu Aug 12 2021 Sérgio Basto <sergio@serjux.com> - 2.10.0-6
+- formatting.py deprecated fix for Pyhton 3.10
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 2.10.0-4
+- Rebuilt for Python 3.10
+
+* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jun 23 2020 Shlomi Fish <shlomif@shlomifish.org> 2.10.0-1
+- New upstream release
+- Add BuildRequires on setuptools
+- Add Requires on python3-freecell_solver
+
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 2.8.0-3
+- Rebuilt for Python 3.9
+
+* Sat Mar 28 2020 Shlomi Fish <shlomif@cpan.org> 2.8.0-2
+- Fix or remove shebangs (RHBZ 1818150)
+- Correct the changelog
+
+* Tue Mar 24 2020 Shlomi Fish <shlomif@cpan.org> 2.8.0-1
+- New upstream version
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.4-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 2.6.4-8
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 2.6.4-7
+- Rebuilt for Python 3.8
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat May 11 2019 Sérgio Basto <sergio@serjux.com> - 2.6.4-5
+- Fix some missing %%{python3_pkgversion}
+
 * Mon May 06 2019 Sérgio Basto <sergio@serjux.com> - 2.6.4-4
 - Add Minimal Cardsets
 

README.packit

@@ -0,0 +1,3 @@
+This repository is maintained by packit.
+https://packit.dev/
+The file was generated using packit 1.8.0.post1.dev31+g9980e597.

packit.yaml

@@ -0,0 +1,26 @@
+# See the documentation for more information:
+# https://packit.dev/docs/configuration/
+
+jobs:
+  - job: pull_from_upstream
+    trigger: release
+    dist_git_branches:
+      rawhide:
+        fast_forward_merge_into:
+          - fedora-all
+          - epel-all
+
+  - job: koji_build
+    trigger: commit
+    allowed_pr_authors:
+      - all_admins
+      - packit
+    dist_git_branches:
+      - fedora-all
+      - epel-all
+
+  - job: bodhi_update
+    trigger: commit
+    dist_git_branches:
+      - fedora-all
+      - epel-all

sources

@@ -1,2 +1,2 @@
-SHA512 (PySolFC-2.6.4.tar.xz) = e88719216054f36ff468c16f5ffe701b0995da88edf4da2266dee528d541c0ae8bbaf503a356e926c626bef2651ca8b6aae539b5cb6b5f0dcb4a04ca6111d6b7
-SHA512 (PySolFC-Cardsets--Minimal-2.0.tar.xz) = d6a499126b7cfdf14928a53756d4f6e67368546207fb6daa70cd0ef542ce8d0d3c1d813905c98971121de94e8a679df130bff1b1ee48d343906a4999af5d1860
+SHA512 (PySolFC-3.4.0.tar.xz) = 208e301cd8f8467e5078aace219a729097a851f09cd47d12ee9723e5b2127e951dfe779704ad0dedacd94c2a9a18553fcc06de8fa426d27a6794eb0d15ff128f
+SHA512 (PySolFC-Cardsets--Minimal-3.0.0.tar.xz) = 9d4bacd072b450b29b9f1bec4557121a3647c2f837aeb6e249f452cb886467c5e7ca36dd36a78ea69a5c9df6f30d5245e12681d9d02fc9da2ece09c25d77e787