Upgrade to 2.6.4 and python3 by Shlomi Fish

Upload sources and update changelog
This commit is contained in:
Sérgio M. Basto 2019-04-26 23:10:33 +01:00
commit d92e541e81
4 changed files with 5 additions and 46 deletions

1
.gitignore vendored
View file

@ -1 +1,2 @@
PySolFC-2.0.tar.bz2
/PySolFC-2.6.4.tar.xz

View file

@ -1,44 +0,0 @@
Index: PySolFC-2.0/pysollib/mfxutil.py
===================================================================
--- PySolFC-2.0.orig/pysollib/mfxutil.py
+++ PySolFC-2.0/pysollib/mfxutil.py
@@ -41,18 +41,18 @@ from settings import PACKAGE, TOOLKIT
Image = ImageTk = ImageOps = None
if TOOLKIT == 'tk':
try: # PIL
- import Image
- import ImageTk
- import ImageOps
+ from PIL import Image
+ from PIL import ImageTk
+ from PIL import ImageOps
except ImportError:
Image = None
else:
# for py2exe
- import GifImagePlugin
- import PngImagePlugin
- import JpegImagePlugin
- import BmpImagePlugin
- import PpmImagePlugin
+ from PIL import GifImagePlugin
+ from PIL import PngImagePlugin
+ from PIL import JpegImagePlugin
+ from PIL import BmpImagePlugin
+ from PIL import PpmImagePlugin
Image._initialized = 2
Index: PySolFC-2.0/scripts/cardset_viewer.py
===================================================================
--- PySolFC-2.0.orig/scripts/cardset_viewer.py
+++ PySolFC-2.0/scripts/cardset_viewer.py
@@ -7,7 +7,7 @@ from glob import glob
from math import sqrt, sin, cos, pi
from Tkinter import *
try:
- import Image, ImageTk
+ from PIL import Image, ImageTk
except ImportError:
Image = None

View file

@ -15,7 +15,6 @@ URL: https://pysolfc.sourceforge.io
Source0: https://downloads.sourceforge.net/pysolfc/%{name}-%{version}.tar.xz
Source1: pysol-start-script
Patch0: PySolFC-desktop-exec.patch
Patch1: PySolFC-pillow.patch
BuildArch: noarch
# optional but nice to have
@ -77,6 +76,9 @@ install -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/pysol
%changelog
* Fri Apr 26 2019 Sérgio Basto <sergio@serjux.com> - 2.6.4-1
- Upgrade to 2.6.4 and python3 by Shlomi Fish
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

View file

@ -1 +1 @@
f9ee647947924efdf1d24af179d3cc0a PySolFC-2.0.tar.bz2
SHA512 (PySolFC-2.6.4.tar.xz) = e88719216054f36ff468c16f5ffe701b0995da88edf4da2266dee528d541c0ae8bbaf503a356e926c626bef2651ca8b6aae539b5cb6b5f0dcb4a04ca6111d6b7