diff --git a/.gitignore b/.gitignore index 127d76b..7208802 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ PySolFC-2.0.tar.bz2 /PySolFC-2.6.4.tar.xz +/PySolFC-Cardsets--Minimal-2.0.tar.xz diff --git a/PySolFC.spec b/PySolFC.spec index caacb3e..51a9d48 100644 --- a/PySolFC.spec +++ b/PySolFC.spec @@ -1,11 +1,12 @@ Name: PySolFC Version: 2.6.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A collection of solitare card games License: GPLv2+ 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 Patch0: PySolFC-desktop-exec.patch BuildArch: noarch @@ -23,8 +24,10 @@ Requires: tix Requires: python3-tkinter Requires: python3-imaging-tk Requires: python3-random2 -Requires: PySolFC-cardsets -Requires: PySolFC-music +%if 0%{?fedora} || 0%{?rhel} > 7 +Recommends: PySolFC-cardsets +Recommends: PySolFC-music +%endif Provides: pysol = %{version}-%{release} %description @@ -35,7 +38,7 @@ 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 +%setup -q -a2 %patch0 -p0 -b .desktop-exec %build @@ -55,24 +58,26 @@ 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 %find_lang pysol %files -f pysol.lang %license COPYING %doc README.md -%dir %{_datadir}/%{name} -%dir %{python3_sitelib}/pysollib -%{python3_sitelib}/pysollib/* +%{python3_sitelib}/pysollib %{python3_sitelib}/*egg-info %{_bindir}/pysol -%{_datadir}/%{name}/* +%{_datadir}/%{name} %{_datadir}/pixmaps/* %{_datadir}/icons/*.png %{_datadir}/applications/*.desktop %changelog +* Mon May 06 2019 Sérgio Basto - 2.6.4-4 +- Add Minimal Cardsets + * Wed May 01 2019 Sérgio Basto - 2.6.4-3 - Requires cartsets and music, clean old stuff and enable build for epel7 diff --git a/sources b/sources index 06cfdc7..6b73d13 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (PySolFC-2.6.4.tar.xz) = e88719216054f36ff468c16f5ffe701b0995da88edf4da2266dee528d541c0ae8bbaf503a356e926c626bef2651ca8b6aae539b5cb6b5f0dcb4a04ca6111d6b7 +SHA512 (PySolFC-Cardsets--Minimal-2.0.tar.xz) = d6a499126b7cfdf14928a53756d4f6e67368546207fb6daa70cd0ef542ce8d0d3c1d813905c98971121de94e8a679df130bff1b1ee48d343906a4999af5d1860