pool/python-Pillow
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 867517 from home:okurz:branches:devel:languages:python

Browse Source 
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
This commit is contained in:
Markéta Machová 2021-01-29 09:45:23 +00:00 committed by Git OBS Bridge
parent fab80212fb
commit 05eff3008a
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python-Pillow.changes
View File

@ -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> Sun Jan 24 11:00:39 UTC 2021 - Dirk Müller <dmueller@suse.com>

8
python-Pillow.spec
View File

@ -57,10 +57,8 @@ Provides: %{oldpython}-imaging = %{version}
Obsoletes: %{oldpython}-imaging-sane < %{version} Obsoletes: %{oldpython}-imaging-sane < %{version}
Provides: %{oldpython}-imaging-sane = %{version} Provides: %{oldpython}-imaging-sane = %{version}
%endif %endif
%ifpython3 Obsoletes: python-imaging < %{version}
Obsoletes: python3-imaging < %{version} Provides: python-imaging = %{version}
Provides: python3-imaging = %{version}
%endif
%python_subpackages %python_subpackages
%description %description
@ -93,9 +91,9 @@ Python Imaging Library by Fredrik Lundh and Contributors.
%install %install
%python_install %python_install
%python_expand %fdupes %{buildroot}%{$python_sitearch}
# add missing path # add missing path
%{python_expand echo "PIL" > %{buildroot}%{$python_sitearch}/PIL.pth} %{python_expand echo "PIL" > %{buildroot}%{$python_sitearch}/PIL.pth}
%python_expand %fdupes %{buildroot}%{$python_sitearch}
%check %check
%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch} PYTHONDONTWRITEBYTECODE=1 %{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch} PYTHONDONTWRITEBYTECODE=1