From 05eff3008aa459d6c81d1fd0c4e7a68b896653a8d82eeee21d584b00f767a348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= <mmachova@suse.com>
Date: Fri, 29 Jan 2021 09:45:23 +0000
Subject: [PATCH] Accepting request 867517 from
 home:okurz:branches:devel:languages:python

Fix package build by relying on %python_subpackages for Obsoletes/Conflicts (bsc#1181281)

OBS-URL: https://build.opensuse.org/request/show/867517
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pillow?expand=0&rev=109
---
 python-Pillow.changes | 6 ++++++
 python-Pillow.spec    | 8 +++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/python-Pillow.changes b/python-Pillow.changes
index 6671b29..99d0572 100644
--- a/python-Pillow.changes
+++ b/python-Pillow.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 28 15:07:09 UTC 2021 - Oliver Kurz <okurz@suse.com>
+
+- Fix rpmlint warning about duplicate file definition
+- Fix package build by relying on %python_subpackages for Obsoletes/Conflicts (bsc#1181281)
+
 -------------------------------------------------------------------
 Sun Jan 24 11:00:39 UTC 2021 - Dirk Müller <dmueller@suse.com>
 
diff --git a/python-Pillow.spec b/python-Pillow.spec
index bd2b769..3c59ec2 100644
--- a/python-Pillow.spec
+++ b/python-Pillow.spec
@@ -57,10 +57,8 @@ Provides:       %{oldpython}-imaging = %{version}
 Obsoletes:      %{oldpython}-imaging-sane < %{version}
 Provides:       %{oldpython}-imaging-sane = %{version}
 %endif
-%ifpython3
-Obsoletes:      python3-imaging < %{version}
-Provides:       python3-imaging = %{version}
-%endif
+Obsoletes:      python-imaging < %{version}
+Provides:       python-imaging = %{version}
 %python_subpackages
 
 %description
@@ -93,9 +91,9 @@ Python Imaging Library by Fredrik Lundh and Contributors.
 
 %install
 %python_install
-%python_expand %fdupes %{buildroot}%{$python_sitearch}
 # add missing path
 %{python_expand echo "PIL" > %{buildroot}%{$python_sitearch}/PIL.pth}
+%python_expand %fdupes %{buildroot}%{$python_sitearch}
 
 %check
 %{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch} PYTHONDONTWRITEBYTECODE=1