import python-reportlab-3.4.0-8.el8
This commit is contained in:
parent
b92648ceee
commit
9a3da75f18
60
SOURCES/python-reportlab-3.4.0-color-eval.patch
Normal file
60
SOURCES/python-reportlab-3.4.0-color-eval.patch
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
--- python3-python-reportlab-3.4.0-6.el8/src/reportlab/lib/colors.py
|
||||||
|
+++ python3-python-reportlab-3.4.0-6.el8/src/reportlab/lib/colors.py
|
||||||
|
@@ -835,6 +835,44 @@ class cssParse:
|
||||||
|
|
||||||
|
cssParse=cssParse()
|
||||||
|
|
||||||
|
+def parseColorClassFromString(arg):
|
||||||
|
+ splitted = "".join(arg.split()).replace('(', ',').replace(')','').split(',')
|
||||||
|
+ fingerprint = ''.join(c for c in arg if c in set('(,)'))
|
||||||
|
+ if (len(splitted) > 0):
|
||||||
|
+ if (splitted[0] == 'Color'):
|
||||||
|
+ if (fingerprint == '(,,,)'):
|
||||||
|
+ try:
|
||||||
|
+ return Color(*list(map(float, splitted[1:5])))
|
||||||
|
+ except:
|
||||||
|
+ return None
|
||||||
|
+ elif (fingerprint == '(,,)'):
|
||||||
|
+ try:
|
||||||
|
+ return Color(*list(map(float, splitted[1:4])))
|
||||||
|
+ except:
|
||||||
|
+ return None
|
||||||
|
+ elif (splitted[0] == 'CMYKColor' and fingerprint == '(,,,)'):
|
||||||
|
+ try:
|
||||||
|
+ return CMYKColor(*list(map(float, splitted[1:5])))
|
||||||
|
+ except:
|
||||||
|
+ return None
|
||||||
|
+ elif (splitted[0] == 'PCMYKColor' and fingerprint == '(,,,)'):
|
||||||
|
+ try:
|
||||||
|
+ return PCMYKColor(*list(map(float, splitted[1:5])))
|
||||||
|
+ except:
|
||||||
|
+ return None
|
||||||
|
+ elif (splitted[0] == 'CMYKColorSep' and fingerprint == '(,,,)'):
|
||||||
|
+ try:
|
||||||
|
+ return CMYKColorSep(*list(map(float, splitted[1:5])))
|
||||||
|
+ except:
|
||||||
|
+ return None
|
||||||
|
+ elif (splitted[0] == 'PCMYKColorSep' and fingerprint == '(,,,)'):
|
||||||
|
+ try:
|
||||||
|
+ return PCMYKColorSep(*list(map(float, splitted[1:5])))
|
||||||
|
+ except:
|
||||||
|
+ return None
|
||||||
|
+ else:
|
||||||
|
+ return None
|
||||||
|
+
|
||||||
|
class toColor:
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
@@ -860,10 +898,8 @@ class toColor:
|
||||||
|
C = getAllNamedColors()
|
||||||
|
s = arg.lower()
|
||||||
|
if s in C: return C[s]
|
||||||
|
- try:
|
||||||
|
- return toColor(eval(arg))
|
||||||
|
- except:
|
||||||
|
- pass
|
||||||
|
+ parsedColor = parseColorClassFromString(arg)
|
||||||
|
+ if (parsedColor): return parsedColor
|
||||||
|
|
||||||
|
try:
|
||||||
|
return HexColor(arg)
|
@ -3,12 +3,15 @@
|
|||||||
|
|
||||||
Name: python-%{pypi}
|
Name: python-%{pypi}
|
||||||
Version: 3.4.0
|
Version: 3.4.0
|
||||||
Release: 6%{?dist}
|
Release: 8%{?dist}
|
||||||
Summary: Library for generating PDFs and graphics
|
Summary: Library for generating PDFs and graphics
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: http://www.reportlab.org/
|
URL: http://www.reportlab.org/
|
||||||
Source0: https://pypi.python.org/packages/source/r/%{pypi}/%{pypi}-%{version}.tar.gz
|
Source0: https://pypi.python.org/packages/source/r/%{pypi}/%{pypi}-%{version}.tar.gz
|
||||||
|
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1769661
|
||||||
|
Patch0: python-reportlab-3.4.0-color-eval.patch
|
||||||
|
|
||||||
%package -n python3-%{pypi}
|
%package -n python3-%{pypi}
|
||||||
Summary: Library for generating PDFs and graphics
|
Summary: Library for generating PDFs and graphics
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
@ -31,7 +34,7 @@ formats.
|
|||||||
%package doc
|
%package doc
|
||||||
Summary: Documentation for %{name}
|
Summary: Documentation for %{name}
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: python3-%{pypi} = %{version}-%{release}
|
||||||
Obsoletes: %{name}-docs < %{version}-%{release}
|
Obsoletes: %{name}-docs < %{version}-%{release}
|
||||||
|
|
||||||
%description doc
|
%description doc
|
||||||
@ -39,6 +42,7 @@ Contains the documentation for ReportLab.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -qn reportlab-%{version}
|
%setup -qn reportlab-%{version}
|
||||||
|
%patch0 -p1 -b .color-eval
|
||||||
# clean up hashbangs from libraries
|
# clean up hashbangs from libraries
|
||||||
find src -name '*.py' | xargs sed -i -e '/^#!\//d'
|
find src -name '*.py' | xargs sed -i -e '/^#!\//d'
|
||||||
# patch the CMap path by adding Fedora ghostscript path before the match
|
# patch the CMap path by adding Fedora ghostscript path before the match
|
||||||
@ -74,6 +78,14 @@ rm -rf %{buildroot}%{python3_sitearch}/reportlab/fonts
|
|||||||
#%doc docs/*.pdf
|
#%doc docs/*.pdf
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jan 15 2020 Marek Kasik <mkasik@redhat.com> - 3.4.0-8
|
||||||
|
- Fix Requires for doc subpackage
|
||||||
|
- Resolves: #1788556
|
||||||
|
|
||||||
|
* Tue Jan 14 2020 Marek Kasik <mkasik@redhat.com> - 3.4.0-7
|
||||||
|
- Do not eval strings passed to toColor
|
||||||
|
- Resolves: #1788556
|
||||||
|
|
||||||
* Thu May 31 2018 Marek Kasik <mkasik@redhat.com> - 3.4.0-6
|
* Thu May 31 2018 Marek Kasik <mkasik@redhat.com> - 3.4.0-6
|
||||||
- Remove python2-reportlab subpackage
|
- Remove python2-reportlab subpackage
|
||||||
- Resolves: #1567162
|
- Resolves: #1567162
|
||||||
|
Loading…
Reference in New Issue
Block a user