Compare commits

...
Sign in to create a new pull request.

20 commits

Author SHA1 Message Date
Python Maint
2ec9ab7051 Rebuilt for Python 3.14.0rc3 bytecode 2025-09-19 12:40:47 +02:00
Python Maint
32e35bb20e Rebuilt for Python 3.14.0rc2 bytecode 2025-08-15 13:09:48 +02:00
Fedora Release Engineering
340f4dbced Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-23 15:56:17 +00:00
Shlomi Fish
b532864956 pyprojectize ; rhbz#2379434 rhbz#2377406 2025-07-11 07:42:17 +03:00
Packit
49644a6994 Update to 3.4.0 upstream release
- Resolves: rhbz#2372876

Commit authored by Packit automation (https://packit.dev/)
2025-06-15 01:28:30 +00:00
Python Maint
87c799c7af Rebuilt for Python 3.14 2025-06-02 19:53:23 +02:00
Shlomi Fish
7bec96ecf1 Revert to use tcl 8 / tk 8 . 2025-03-07 10:30:15 +02:00
Shlomi Fish
14d0a11568 tcl/tk versions 9 2025-02-18 03:46:50 +02:00
Sérgio M. Basto
cec72050b8 Modified packit just to trigger builds for pull requests 2025-02-11 16:47:28 +00:00
Shlomi Fish
2056651050 Update the build process for tcl 9 / tk 9 2025-02-08 13:30:42 +02:00
Fedora Release Engineering
fe8e10abad Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-16 08:54:25 +00:00
Packit
7c4046f26b Update to 3.2.0 upstream release
- Resolves: rhbz#2337163

Commit authored by Packit automation (https://packit.dev/)
2025-01-11 19:07:35 +00:00
Packit
252f79781b Update to 3.1.0 upstream release
- Resolves: rhbz#2319948

Commit authored by Packit automation (https://packit.dev/)
2024-10-21 02:57:00 +00:00
Sérgio M. Basto
0b562f9da0 Configure Packit for release automation
See details in https://packit.dev/docs/fedora-releases-guide/dist-git-onboarding
2024-10-21 03:38:33 +01:00
Fedora Release Engineering
01c01bb8b3 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-17 15:08:35 +00:00
Python Maint
f7a34112d2 Rebuilt for Python 3.13 2024-06-07 08:30:22 +02:00
Shlomi Fish
534e68e237 New upstream versions ( 3.0.0 ) 2024-06-03 22:12:22 +03:00
Sérgio M. Basto
54bd7e990b py3_shebang_fix is not needed and fix epel-7 build 2024-03-03 22:16:45 +00:00
Fedora Release Engineering
98bb0b3138 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-22 21:12:33 +00:00
Fedora Release Engineering
4e840cebbe Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-19 10:16:12 +00:00
5 changed files with 113 additions and 16 deletions

5
.gitignore vendored
View file

@ -14,3 +14,8 @@ PySolFC-2.0.tar.bz2
/PySolFC-2.20.1.tar.xz /PySolFC-2.20.1.tar.xz
/PySolFC-Cardsets--Minimal-2.2.0.tar.xz /PySolFC-Cardsets--Minimal-2.2.0.tar.xz
/PySolFC-2.21.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

View file

@ -1,8 +1,8 @@
%global cardsets_minimal_ver 2.2.0 %global cardsets_minimal_ver 3.0.0
Name: PySolFC Name: PySolFC
Version: 2.21.0 Version: 3.4.0
Release: 3%{?dist} Release: 5%{?dist}
Summary: A collection of solitaire card games Summary: A collection of solitaire card games
License: GPL-2.0-or-later License: GPL-2.0-or-later
URL: https://pysolfc.sourceforge.io URL: https://pysolfc.sourceforge.io
@ -10,14 +10,13 @@ Source0: https://downloads.sourceforge.net/pysolfc/%{name}-%{version}.tar
Source1: pysol-start-script Source1: pysol-start-script
Source2: https://downloads.sourceforge.net/pysolfc/PySolFC-Cardsets--Minimal-%{cardsets_minimal_ver}.tar.xz Source2: https://downloads.sourceforge.net/pysolfc/PySolFC-Cardsets--Minimal-%{cardsets_minimal_ver}.tar.xz
Patch0: PySolFC-desktop-exec.patch Patch0: PySolFC-desktop-exec.patch
# https://github.com/shlomif/PySolFC/pull/353
Patch1: PySolFC-pycotap_not_required_to_run.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: perl-interpreter BuildRequires: perl-interpreter
BuildRequires: tcl-devel < 1:9
BuildRequires: tk-devel < 1:9
%if 0%{?fedora} %if 0%{?fedora}
# optional but nice to have but not available in any epel branch # optional but nice to have but not available in any epel branch
@ -31,12 +30,11 @@ Requires: tile
# used to get sound working with PulseAudio # used to get sound working with PulseAudio
Requires: python%{python3_pkgversion}-pygame Requires: python%{python3_pkgversion}-pygame
# really required # really required
Requires: tcl # Requires: tcl >= 9
Requires: tk # Requires: tk >= 9
Requires: tix Requires: tix
Requires: python%{python3_pkgversion}-tkinter Requires: python%{python3_pkgversion}-tkinter
Requires: python%{python3_pkgversion}-imaging-tk Requires: python%{python3_pkgversion}-imaging-tk
Requires: python%{python3_pkgversion}-random2
%if 0%{?fedora} || 0%{?rhel} > 7 %if 0%{?fedora} || 0%{?rhel} > 7
Recommends: PySolFC-cardsets Recommends: PySolFC-cardsets
Recommends: PySolFC-music Recommends: PySolFC-music
@ -52,18 +50,21 @@ Provides: pysol = %{version}-%{release}
%description %description
%{name} is a collection of more than 1000 solitaire card games. It is a fork %{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 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 statistics, a hint system, demo games, a solitaire wizard, support for user
written plug-ins, an integrated HTML help browser, and lots of documentation. written plug-ins, an integrated HTML help browser, and lots of documentation.
%prep %prep
%autosetup -p1 -a2 %autosetup -p1 -a2
%generate_buildrequires
%pyproject_buildrequires
%build %build
%py3_build %pyproject_wheel
%install %install
%py3_install %pyproject_install
# install desktop file # install desktop file
desktop-file-install \ desktop-file-install \
--delete-original \ --delete-original \
@ -75,7 +76,6 @@ mv $RPM_BUILD_ROOT%{_bindir}/pysol.py $RPM_BUILD_ROOT%{_datadir}/%{name}
install -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/pysol install -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/pysol
cp -a PySolFC-Cardsets--Minimal-%{cardsets_minimal_ver}/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 "$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 %find_lang pysol
@ -83,7 +83,7 @@ find "$RPM_BUILD_ROOT%{python3_sitelib}/pysollib" -name '*.py' | xargs -L1 perl
%license COPYING %license COPYING
%doc README.md %doc README.md
%{python3_sitelib}/pysollib %{python3_sitelib}/pysollib
%{python3_sitelib}/*egg-info %{python3_sitelib}/*dist-info
%{_bindir}/pysol %{_bindir}/pysol
%{_datadir}/%{name} %{_datadir}/%{name}
%{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/icons/hicolor/*/apps/*.png
@ -91,6 +91,69 @@ find "$RPM_BUILD_ROOT%{python3_sitelib}/pysollib" -name '*.py' | xargs -L1 perl
%changelog %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 * 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 - Do not require pycotap to run PySol, pycotap is only needed for the single
unittest ( https://github.com/shlomif/PySolFC/pull/353 ) unittest ( https://github.com/shlomif/PySolFC/pull/353 )

3
README.packit Normal file
View file

@ -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.

26
packit.yaml Normal file
View file

@ -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

View file

@ -1,2 +1,2 @@
SHA512 (PySolFC-2.21.0.tar.xz) = 7e2f4d45810288880a8b0d866110be00805c27d20dc94a4393079b94579253ee6bc1ed7355752842faf092d7a1bfe03ec4c3d6e1e61f2ddb39b959b3a830448d SHA512 (PySolFC-3.4.0.tar.xz) = 208e301cd8f8467e5078aace219a729097a851f09cd47d12ee9723e5b2127e951dfe779704ad0dedacd94c2a9a18553fcc06de8fa426d27a6794eb0d15ff128f
SHA512 (PySolFC-Cardsets--Minimal-2.2.0.tar.xz) = d5eb0753d14e0758f410d843f553ca6c03acc6d4283b447016e959c889c9dada29fa3facead44354782010b52ec51e0d095858d3b78243ad5280068ec6cd3e31 SHA512 (PySolFC-Cardsets--Minimal-3.0.0.tar.xz) = 9d4bacd072b450b29b9f1bec4557121a3647c2f837aeb6e249f452cb886467c5e7ca36dd36a78ea69a5c9df6f30d5245e12681d9d02fc9da2ece09c25d77e787