Hello community, here is the log from the commit of package python-Pillow for openSUSE:Factory checked in at 2014-06-24 22:45:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Pillow (Old) and /work/SRC/openSUSE:Factory/.python-Pillow.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Pillow" Changes: -------- --- /work/SRC/openSUSE:Factory/python-Pillow/python-Pillow.changes 2014-02-15 08:06:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-Pillow.new/python-Pillow.changes 2014-06-24 22:45:54.000000000 +0200 @@ -1,0 +2,24 @@ +Wed May 28 08:24:20 UTC 2014 - toddrme2...@gmail.com + +- Fixing conflicting provides/conflicts that prevent installation + of the tk subpackage. + +------------------------------------------------------------------- +Tue May 27 08:25:54 UTC 2014 - mci...@suse.com + +- Adjust openjpeg2 dependency for older distributions + +------------------------------------------------------------------- +Thu May 8 14:22:57 UTC 2014 - h...@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 - h...@urpla.net + +- provide python-imaging in order to act as a drop in replacement + for it. + +------------------------------------------------------------------- @@ -4,0 +29,6 @@ + +------------------------------------------------------------------- +Tue Feb 4 10:53:08 UTC 2014 - h...@urpla.net + +- symlink alternatives files, as requested from Coolo, in order to + get rid of suse version conditional Old: ---- Pillow-2.3.0.zip New: ---- Pillow-2.4.0.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Pillow.spec ++++++ --- /var/tmp/diff_new_pack.VeYqUH/_old 2014-06-24 22:45:55.000000000 +0200 +++ /var/tmp/diff_new_pack.VeYqUH/_new 2014-06-24 22:45:55.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-Pillow -Version: 2.3.0 +Version: 2.4.0 Release: 0 Summary: Python Imaging Library (Fork) License: HPND @@ -35,6 +35,9 @@ BuildRequires: liblcms2-devel BuildRequires: libwebp-devel %endif +%if 0%{?suse_version} > 1315 +BuildRequires: openjpeg2-devel +%endif BuildRequires: freetype2-devel BuildRequires: libtiff-devel BuildRequires: zlib-devel @@ -48,7 +51,11 @@ 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 @@ -58,12 +65,13 @@ 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 @@ -76,13 +84,15 @@ %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 +129,11 @@ %{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,-) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
