From 42479cf82a3300eac167e0db6190c95c91a4874797717f65b527ce3c9a7fd517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 19 May 2014 11:49:09 +0000 Subject: [PATCH 1/3] Accepting request 233204 from home:frispete:python New attempt to submit this, now providing python-imaging @Sascha: sure, it might been wrong to provide python-imaging in the first place, but python-Pillow without it doesn't make muchg sense, or do you really want to adjust all dependant packages? Here, that where scribus and python-repostlab, which both seem to work fine with Pillow, apart from the imaging dependency. BTW: this is the way, Redhat handles this issue, too. Incorporated the new release, and added openjpeg2 dependency. - New upstream release 2.4.0. For details see https://pypi.python.org/pypi/Pillow/2.4.0 - New dependency: openjpeg2 for JPEG 2000 support - provide python-imaging in order to act as a drop in replacement for it. - symlink alternatives files, as requested from Coolo, in order to get rid of suse version conditional OBS-URL: https://build.opensuse.org/request/show/233204 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pillow?expand=0&rev=13 --- Pillow-2.3.0.zip | 3 --- Pillow-2.4.0.zip | 3 +++ python-Pillow.changes | 19 +++++++++++++++++++ python-Pillow.spec | 13 +++++++++---- 4 files changed, 31 insertions(+), 7 deletions(-) delete mode 100644 Pillow-2.3.0.zip create mode 100644 Pillow-2.4.0.zip diff --git a/Pillow-2.3.0.zip b/Pillow-2.3.0.zip deleted file mode 100644 index 6ca4d58..0000000 --- a/Pillow-2.3.0.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b38e7e32401ae2d949cb4b82c6388cd13e697d1e2f8a1bffce3b834d00fbca13 -size 2421241 diff --git a/Pillow-2.4.0.zip b/Pillow-2.4.0.zip new file mode 100644 index 0000000..3f5aff6 --- /dev/null +++ b/Pillow-2.4.0.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2865c68b3a5638466b1837bf4a67c447e0cfdf7463309a068aad0e90aa03f58a +size 6519873 diff --git a/python-Pillow.changes b/python-Pillow.changes index abb3b13..71826e7 100644 --- a/python-Pillow.changes +++ b/python-Pillow.changes @@ -1,8 +1,27 @@ +------------------------------------------------------------------- +Thu May 8 14:22:57 UTC 2014 - hpj@urpla.net + +- New upstream release 2.4.0. For details see + https://pypi.python.org/pypi/Pillow/2.4.0 +- New dependency: openjpeg2 for JPEG 2000 support + +------------------------------------------------------------------- +Sun Apr 27 21:30:58 UTC 2014 - hpj@urpla.net + +- provide python-imaging in order to act as a drop in replacement + for it. + ------------------------------------------------------------------- Fri Feb 14 07:28:32 UTC 2014 - mcihar@suse.cz - Fix build for older distributions which do not include lcms2 +------------------------------------------------------------------- +Tue Feb 4 10:53:08 UTC 2014 - hpj@urpla.net + +- symlink alternatives files, as requested from Coolo, in order to + get rid of suse version conditional + ------------------------------------------------------------------- Fri Jan 17 21:59:13 UTC 2014 - hpj@urpla.net diff --git a/python-Pillow.spec b/python-Pillow.spec index 6f7a483..05e674f 100644 --- a/python-Pillow.spec +++ b/python-Pillow.spec @@ -17,7 +17,7 @@ Name: python-Pillow -Version: 2.3.0 +Version: 2.4.0 Release: 0 Summary: Python Imaging Library (Fork) License: HPND @@ -34,6 +34,7 @@ BuildRequires: unzip BuildRequires: libjpeg8-devel BuildRequires: liblcms2-devel BuildRequires: libwebp-devel +BuildRequires: openjpeg2-devel %endif BuildRequires: freetype2-devel BuildRequires: libtiff-devel @@ -48,7 +49,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Conflicts: python-imaging # NOTE(saschpe): python-imaging should have never provided this and I'm a bit relucatant do it either. # http://en.opensuse.org/openSUSE:Upgrade_dependencies_explanation#Replace_a_package_by_another_with_the_same_functionality +# ALSO NOTE (frispete): without providing python-imaging, all packages requiring it will break +Provides: python-imaging + Obsoletes: python-imaging-sane +Provides: python-imaging-sane %description Pillow is the "friendly" PIL fork by Alex Clark and Contributors. PIL is the @@ -76,13 +81,15 @@ Python Imaging Library by Fredrik Lundh and Contributors. %setup -q -n Pillow-%{version} %build -CFLAGS="%{optflags}" python setup.py build +# no need to build it here, as setup.py install will build it again, anyway %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} +mkdir -p %{buildroot}%{_sysconfdir}/alternatives for p in pilconvert pildriver pilfile pilfont pilprint ; do mv %{buildroot}%{_bindir}/$p.py %{buildroot}%{_bindir}/$p-%{py_ver} ln -s %{_bindir}/$p-%{py_ver} %{buildroot}%{_bindir}/$p + ln -s %{_bindir}/$p-%{py_ver} %{buildroot}%{_sysconfdir}/alternatives/$p done %check @@ -119,13 +126,11 @@ fi %{python_sitearch}/Pillow-%{version}-py%{py_ver}.egg-info %exclude %{python_sitearch}/PIL/ImageTk* %exclude %{python_sitearch}/PIL/_imagingtk* -%if 0%{?suse_version} > 1220 %ghost %{_sysconfdir}/alternatives/pilconvert %ghost %{_sysconfdir}/alternatives/pildriver %ghost %{_sysconfdir}/alternatives/pilfile %ghost %{_sysconfdir}/alternatives/pilfont %ghost %{_sysconfdir}/alternatives/pilprint -%endif %files tk %defattr(-,root,root,-) From 973f94461deadd580e321aeffbf48725a784627ddf1e073da83a348ddd43f56b Mon Sep 17 00:00:00 2001 From: Todd R Date: Tue, 27 May 2014 12:54:18 +0000 Subject: [PATCH 2/3] Accepting request 235507 from home:Nijel:branches:devel:languages:python Adjust openjpeg2 dependency for older distributions The openjpeg2 package is not available in SLE12 and older, so let's build Pillow there without it. OBS-URL: https://build.opensuse.org/request/show/235507 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pillow?expand=0&rev=14 --- python-Pillow.changes | 5 +++++ python-Pillow.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/python-Pillow.changes b/python-Pillow.changes index 71826e7..ced4017 100644 --- a/python-Pillow.changes +++ b/python-Pillow.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 27 08:25:54 UTC 2014 - mcihar@suse.com + +- Adjust openjpeg2 dependency for older distributions + ------------------------------------------------------------------- Thu May 8 14:22:57 UTC 2014 - hpj@urpla.net diff --git a/python-Pillow.spec b/python-Pillow.spec index 05e674f..ec96bab 100644 --- a/python-Pillow.spec +++ b/python-Pillow.spec @@ -34,6 +34,8 @@ BuildRequires: unzip BuildRequires: libjpeg8-devel BuildRequires: liblcms2-devel BuildRequires: libwebp-devel +%endif +%if 0%{?suse_version} > 1315 BuildRequires: openjpeg2-devel %endif BuildRequires: freetype2-devel From cce204024a0f8984604fc0e12581e54f518ff5daf649a793487ecaf42f11ebfb Mon Sep 17 00:00:00 2001 From: Todd R Date: Wed, 28 May 2014 08:43:10 +0000 Subject: [PATCH 3/3] Accepting request 235635 from home:TheBlackCat:branches:devel:languages:python Fixing conflicting provides/conflicts that prevent installation of the tk subpackage. This should fix the problems reported with the previous openSUSE:Factory submission. OBS-URL: https://build.opensuse.org/request/show/235635 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pillow?expand=0&rev=15 --- python-Pillow.changes | 6 ++++++ python-Pillow.spec | 13 +++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/python-Pillow.changes b/python-Pillow.changes index ced4017..a9a753c 100644 --- a/python-Pillow.changes +++ b/python-Pillow.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 28 08:24:20 UTC 2014 - toddrme2178@gmail.com + +- Fixing conflicting provides/conflicts that prevent installation + of the tk subpackage. + ------------------------------------------------------------------- Tue May 27 08:25:54 UTC 2014 - mcihar@suse.com diff --git a/python-Pillow.spec b/python-Pillow.spec index ec96bab..f4f4d96 100644 --- a/python-Pillow.spec +++ b/python-Pillow.spec @@ -65,12 +65,13 @@ Python Imaging Library by Fredrik Lundh and Contributors. Summary: Python Imaging Library (Fork) - Tcl/Tk Module Group: Development/Languages/Python Requires: %{name} = %{version} -# NOTE(saschpe): imaging used to (wrongly) ship the tk module too, so we've got to conflict with it. -Provides: python-imaging:%{python_sitearch}/PIL/ImageTk.py* -Provides: python-imaging:%{python_sitearch}/PIL/_imagingtk.so -# NOTE(saschpe): This would be to much, no?: -#Provides: python-imaging:%{_datadir}/doc/packages/python-imaging/Docs/pythondoc-PIL.ImageTk.html -Conflicts: python-imaging +# NOTE: We don't need to conflict with python-imaging here, +# because this package depends on python-Pillow, which already conflicts with python-imaging, +# so this cannot be installed alongside python-imaging +# And we cannot conflict with python-imaging directly, since python-Pillow provides python-imaging +# Just in case, conflict with python-imaging-tk in case it is ever implemented. +Obsoletes: python-imaging-tk +Provides: python-imaging-tk %description tk Pillow is the "friendly" PIL fork by Alex Clark and Contributors. PIL is the