From e040fec99ccbd6abc794e329bd1a247fcc1a986b Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Mar 28 2020 09:02:31 +0000 Subject: correct shebangs and typos (BZ#1818150) --- diff --git a/PySolFC.spec b/PySolFC.spec index 9e45195..35addf5 100644 --- a/PySolFC.spec +++ b/PySolFC.spec @@ -1,7 +1,7 @@ Name: PySolFC Version: 2.8.0 -Release: 1%{?dist} -Summary: A collection of solitare card games +Release: 2%{?dist} +Summary: A collection of solitaire card games License: GPLv2+ URL: https://pysolfc.sourceforge.io Source0: https://downloads.sourceforge.net/pysolfc/%{name}-%{version}.tar.xz @@ -12,6 +12,8 @@ BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel BuildRequires: desktop-file-utils +BuildRequires: perl-interpreter +BuildRequires: /usr/bin/pathfix.py # optional but nice to have Requires: python%{python3_pkgversion}-imaging Requires: tile @@ -32,7 +34,7 @@ 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 +of PySol solitaire. Its features include modern look and feel (uses Tile widget 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. @@ -59,6 +61,8 @@ desktop-file-install \ 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 "$RPM_BUILD_ROOT%{python3_sitelib}/pysollib" -name '*.py' | xargs -L1 perl -ln -i -E 'say if (not (($. == 1) and (m&^#![ \t]*/usr/&)))' +pathfix.py -pni "%{__python3} %{py3_shbang_opts}" $RPM_BUILD_ROOT%{_bindir}/* %find_lang pysol @@ -75,6 +79,10 @@ cp -a PySolFC-Cardsets--Minimal-2.0/cardset-* $RPM_BUILD_ROOT%{_datadir}/PySolFC %changelog +* Sat Mar 28 2020 Shlomi Fish 2.8.0-2 +- Fix or remove shebangs (RHBZ 1818150) +- Correct the changelog + * Tue Mar 24 2020 Shlomi Fish 2.8.0-1 - New upstream version