From eb8049372c805712a3651f1c98f44b7bcd31a7915fa1984f008f15f16cbefa06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 6 Dec 2018 12:18:31 +0000 Subject: [PATCH] - Fix fdupes call - Fix some version conditionals OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pillow?expand=0&rev=76 --- python-Pillow.changes | 6 ++++++ python-Pillow.spec | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/python-Pillow.changes b/python-Pillow.changes index 9ac7f1f..d99e358 100644 --- a/python-Pillow.changes +++ b/python-Pillow.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 6 12:18:06 UTC 2018 - Tomáš Chvátal + +- Fix fdupes call +- Fix some version conditionals + ------------------------------------------------------------------- Mon Oct 8 14:54:15 UTC 2018 - Arun Persaud diff --git a/python-Pillow.spec b/python-Pillow.spec index 883b703..a00aa46 100644 --- a/python-Pillow.spec +++ b/python-Pillow.spec @@ -18,7 +18,7 @@ %define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%if 0%{?is_opensuse} || 0%{?suse_version} > 1330 +%if 0%{?is_opensuse} || 0%{?suse_version} >= 1500 %bcond_without tk %else %bcond_with tk @@ -51,7 +51,7 @@ Requires: python-olefile %if %{with tk} BuildRequires: %{python_module tk} %endif -%if 0%{?suse_version} > 1315 +%if 0%{?suse_version} >= 1500 BuildRequires: openjpeg2-devel %endif %ifpython2 @@ -100,7 +100,7 @@ Python Imaging Library by Fredrik Lundh and Contributors. %install %python_install -%fdupes %{buildroot}%{_prefix} +%python_expand %fdupes %{buildroot}%{$python_sitelib} # add missing path %{python_expand echo "PIL" > %{buildroot}%{$python_sitearch}/PIL.pth}