diff --git a/.gitignore b/.gitignore index ea43618..1444956 100644 --- a/.gitignore +++ b/.gitignore @@ -13,9 +13,3 @@ PySolFC-2.0.tar.bz2 /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 diff --git a/PySolFC-pycotap_not_required_to_run.patch b/PySolFC-pycotap_not_required_to_run.patch deleted file mode 100644 index 93be760..0000000 --- a/PySolFC-pycotap_not_required_to_run.patch +++ /dev/null @@ -1,12 +0,0 @@ -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', diff --git a/PySolFC.spec b/PySolFC.spec index 53e7ac2..866fca5 100644 --- a/PySolFC.spec +++ b/PySolFC.spec @@ -1,10 +1,10 @@ -%global cardsets_minimal_ver 3.0.0 +%global cardsets_minimal_ver 2.2.0 Name: PySolFC -Version: 3.4.0 -Release: 5%{?dist} +Version: 2.20.1 +Release: 2%{?dist} Summary: A collection of solitaire card games -License: GPL-2.0-or-later +License: GPLv2+ URL: https://pysolfc.sourceforge.io Source0: https://downloads.sourceforge.net/pysolfc/%{name}-%{version}.tar.xz Source1: pysol-start-script @@ -13,10 +13,9 @@ 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 -BuildRequires: tk-devel < 1:9 %if 0%{?fedora} # optional but nice to have but not available in any epel branch @@ -30,11 +29,12 @@ Requires: tile # used to get sound working with PulseAudio Requires: python%{python3_pkgversion}-pygame # really required -# Requires: tcl >= 9 -# Requires: tk >= 9 +Requires: tcl +Requires: tk 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 @@ -50,21 +50,18 @@ 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 card-sets and tableau backgrounds, sound, unlimited undo, player +set), multiple cardsets 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 -%pyproject_wheel +%py3_build %install -%pyproject_install +%py3_install # install desktop file desktop-file-install \ --delete-original \ @@ -76,6 +73,7 @@ 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-%{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/&)))' +%py3_shebang_fix $RPM_BUILD_ROOT%{_bindir}/* %find_lang pysol @@ -83,7 +81,7 @@ find "$RPM_BUILD_ROOT%{python3_sitelib}/pysollib" -name '*.py' | xargs -L1 perl %license COPYING %doc README.md %{python3_sitelib}/pysollib -%{python3_sitelib}/*dist-info +%{python3_sitelib}/*egg-info %{_bindir}/pysol %{_datadir}/%{name} %{_datadir}/icons/hicolor/*/apps/*.png @@ -91,85 +89,6 @@ 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 - -* 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 -- rhbz#2379434 -- rhbz#2377406 - -* 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 - -* 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 - -* 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 - -* Sat Jan 11 2025 Packit - 3.2.0-1 -- Update to version 3.2.0 -- Resolves: rhbz#2337163 - -* Mon Oct 21 2024 Packit - 3.1.0-1 -- Update to version 3.1.0 -- Resolves: rhbz#2319948 - -* Wed Jul 17 2024 Fedora Release Engineering - 3.0.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Jun 07 2024 Python Maint - 3.0.0-2 -- Rebuilt for Python 3.13 - -* Mon Jun 03 2024 Shlomi Fish 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 - 2.21.0-6 -- py3_shebang_fix is not needed and fix epel-7 build - -* Mon Jan 22 2024 Fedora Release Engineering - 2.21.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 2.21.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Dec 01 2023 Sérgio Basto - 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 - 2.21.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jul 12 2023 Shlomi Fish 2.21.0-1 -- Update PySolFC to 2.21.0. - -* Sat Jun 24 2023 Sérgio Basto - 2.20.1-4 -- Migrate to SPDX license format - -* Tue Jun 13 2023 Python Maint - 2.20.1-3 -- Rebuilt for Python 3.12 - * Thu May 18 2023 Sérgio Basto - 2.20.1-2 - Update cardsets_minimal_ver to 2.2.0 diff --git a/README.packit b/README.packit deleted file mode 100644 index 6beb40f..0000000 --- a/README.packit +++ /dev/null @@ -1,3 +0,0 @@ -This repository is maintained by packit. -https://packit.dev/ -The file was generated using packit 1.8.0.post1.dev31+g9980e597. diff --git a/packit.yaml b/packit.yaml deleted file mode 100644 index 7268bcf..0000000 --- a/packit.yaml +++ /dev/null @@ -1,26 +0,0 @@ -# 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 diff --git a/sources b/sources index 2536c04..8f97175 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (PySolFC-3.4.0.tar.xz) = 208e301cd8f8467e5078aace219a729097a851f09cd47d12ee9723e5b2127e951dfe779704ad0dedacd94c2a9a18553fcc06de8fa426d27a6794eb0d15ff128f -SHA512 (PySolFC-Cardsets--Minimal-3.0.0.tar.xz) = 9d4bacd072b450b29b9f1bec4557121a3647c2f837aeb6e249f452cb886467c5e7ca36dd36a78ea69a5c9df6f30d5245e12681d9d02fc9da2ece09c25d77e787 +SHA512 (PySolFC-2.20.1.tar.xz) = f801dacfb3f538496a7dd2fd1777897681521928fe7ea8aec7ea514c1422e8d4ad6c0943ba534914d95544d8eb5e4868f860e6864a8e105f6cc0d16a3d678346 +SHA512 (PySolFC-Cardsets--Minimal-2.2.0.tar.xz) = d5eb0753d14e0758f410d843f553ca6c03acc6d4283b447016e959c889c9dada29fa3facead44354782010b52ec51e0d095858d3b78243ad5280068ec6cd3e31