diff --git a/.gitignore b/.gitignore index ea43618..093e7b4 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,3 @@ 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/packit.yaml b/.packit.yaml similarity index 74% rename from packit.yaml rename to .packit.yaml index 7268bcf..927a968 100644 --- a/packit.yaml +++ b/.packit.yaml @@ -5,20 +5,14 @@ jobs: - job: pull_from_upstream trigger: release dist_git_branches: - rawhide: - fast_forward_merge_into: - - fedora-all - - epel-all - + - fedora-rawhide - job: koji_build trigger: commit - allowed_pr_authors: + allowed_committers: - all_admins - - packit dist_git_branches: - fedora-all - epel-all - - job: bodhi_update trigger: commit dist_git_branches: diff --git a/PySolFC.spec b/PySolFC.spec index 53e7ac2..78f6a1d 100644 --- a/PySolFC.spec +++ b/PySolFC.spec @@ -1,8 +1,8 @@ %global cardsets_minimal_ver 3.0.0 Name: PySolFC -Version: 3.4.0 -Release: 5%{?dist} +Version: 3.2.0 +Release: 2%{?dist} Summary: A collection of solitaire card games License: GPL-2.0-or-later URL: https://pysolfc.sourceforge.io @@ -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 \ @@ -83,7 +80,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,39 +88,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 diff --git a/README.packit b/README.packit index 6beb40f..8c905b9 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 1.8.0.post1.dev31+g9980e597. +The file was generated using packit 0.106.0.post1.dev8+g521f1e1d. diff --git a/sources b/sources index 2536c04..d18d799 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (PySolFC-3.4.0.tar.xz) = 208e301cd8f8467e5078aace219a729097a851f09cd47d12ee9723e5b2127e951dfe779704ad0dedacd94c2a9a18553fcc06de8fa426d27a6794eb0d15ff128f +SHA512 (PySolFC-3.2.0.tar.xz) = 190d20228585942ebf8be42514561a1642a2f102a4e32cf9e12d5b429f34279a447268839156d1e153be2147c152d738065bdbbc79d6494cfb9b5dcc901630d9 SHA512 (PySolFC-Cardsets--Minimal-3.0.0.tar.xz) = 9d4bacd072b450b29b9f1bec4557121a3647c2f837aeb6e249f452cb886467c5e7ca36dd36a78ea69a5c9df6f30d5245e12681d9d02fc9da2ece09c25d77e787