forked from pool/python-Pillow
Accepting request 235636 from 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. (forwarded request 235635 from TheBlackCat) OBS-URL: https://build.opensuse.org/request/show/235636 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-Pillow?expand=0&rev=5
This commit is contained in:
commit
65cea6f0c3
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:b38e7e32401ae2d949cb4b82c6388cd13e697d1e2f8a1bffce3b834d00fbca13
|
|
||||||
size 2421241
|
|
3
Pillow-2.4.0.zip
Normal file
3
Pillow-2.4.0.zip
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:2865c68b3a5638466b1837bf4a67c447e0cfdf7463309a068aad0e90aa03f58a
|
||||||
|
size 6519873
|
@ -1,8 +1,38 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
||||||
|
|
||||||
|
- Adjust openjpeg2 dependency for older distributions
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
Fri Feb 14 07:28:32 UTC 2014 - mcihar@suse.cz
|
||||||
|
|
||||||
- Fix build for older distributions which do not include lcms2
|
- 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
|
Fri Jan 17 21:59:13 UTC 2014 - hpj@urpla.net
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: python-Pillow
|
Name: python-Pillow
|
||||||
Version: 2.3.0
|
Version: 2.4.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Python Imaging Library (Fork)
|
Summary: Python Imaging Library (Fork)
|
||||||
License: HPND
|
License: HPND
|
||||||
@ -35,6 +35,9 @@ BuildRequires: libjpeg8-devel
|
|||||||
BuildRequires: liblcms2-devel
|
BuildRequires: liblcms2-devel
|
||||||
BuildRequires: libwebp-devel
|
BuildRequires: libwebp-devel
|
||||||
%endif
|
%endif
|
||||||
|
%if 0%{?suse_version} > 1315
|
||||||
|
BuildRequires: openjpeg2-devel
|
||||||
|
%endif
|
||||||
BuildRequires: freetype2-devel
|
BuildRequires: freetype2-devel
|
||||||
BuildRequires: libtiff-devel
|
BuildRequires: libtiff-devel
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
@ -48,7 +51,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|||||||
Conflicts: python-imaging
|
Conflicts: python-imaging
|
||||||
# NOTE(saschpe): python-imaging should have never provided this and I'm a bit relucatant do it either.
|
# 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
|
# 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
|
Obsoletes: python-imaging-sane
|
||||||
|
Provides: python-imaging-sane
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Pillow is the "friendly" PIL fork by Alex Clark and Contributors. PIL is the
|
Pillow is the "friendly" PIL fork by Alex Clark and Contributors. PIL is the
|
||||||
@ -58,12 +65,13 @@ Python Imaging Library by Fredrik Lundh and Contributors.
|
|||||||
Summary: Python Imaging Library (Fork) - Tcl/Tk Module
|
Summary: Python Imaging Library (Fork) - Tcl/Tk Module
|
||||||
Group: Development/Languages/Python
|
Group: Development/Languages/Python
|
||||||
Requires: %{name} = %{version}
|
Requires: %{name} = %{version}
|
||||||
# NOTE(saschpe): imaging used to (wrongly) ship the tk module too, so we've got to conflict with it.
|
# NOTE: We don't need to conflict with python-imaging here,
|
||||||
Provides: python-imaging:%{python_sitearch}/PIL/ImageTk.py*
|
# because this package depends on python-Pillow, which already conflicts with python-imaging,
|
||||||
Provides: python-imaging:%{python_sitearch}/PIL/_imagingtk.so
|
# so this cannot be installed alongside python-imaging
|
||||||
# NOTE(saschpe): This would be to much, no?:
|
# And we cannot conflict with python-imaging directly, since python-Pillow provides python-imaging
|
||||||
#Provides: python-imaging:%{_datadir}/doc/packages/python-imaging/Docs/pythondoc-PIL.ImageTk.html
|
# Just in case, conflict with python-imaging-tk in case it is ever implemented.
|
||||||
Conflicts: python-imaging
|
Obsoletes: python-imaging-tk
|
||||||
|
Provides: python-imaging-tk
|
||||||
|
|
||||||
%description tk
|
%description tk
|
||||||
Pillow is the "friendly" PIL fork by Alex Clark and Contributors. PIL is the
|
Pillow is the "friendly" PIL fork by Alex Clark and Contributors. PIL is the
|
||||||
@ -76,13 +84,15 @@ Python Imaging Library by Fredrik Lundh and Contributors.
|
|||||||
%setup -q -n Pillow-%{version}
|
%setup -q -n Pillow-%{version}
|
||||||
|
|
||||||
%build
|
%build
|
||||||
CFLAGS="%{optflags}" python setup.py build
|
# no need to build it here, as setup.py install will build it again, anyway
|
||||||
|
|
||||||
%install
|
%install
|
||||||
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
|
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
|
||||||
|
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
|
||||||
for p in pilconvert pildriver pilfile pilfont pilprint ; do
|
for p in pilconvert pildriver pilfile pilfont pilprint ; do
|
||||||
mv %{buildroot}%{_bindir}/$p.py %{buildroot}%{_bindir}/$p-%{py_ver}
|
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}%{_bindir}/$p
|
||||||
|
ln -s %{_bindir}/$p-%{py_ver} %{buildroot}%{_sysconfdir}/alternatives/$p
|
||||||
done
|
done
|
||||||
|
|
||||||
%check
|
%check
|
||||||
@ -119,13 +129,11 @@ fi
|
|||||||
%{python_sitearch}/Pillow-%{version}-py%{py_ver}.egg-info
|
%{python_sitearch}/Pillow-%{version}-py%{py_ver}.egg-info
|
||||||
%exclude %{python_sitearch}/PIL/ImageTk*
|
%exclude %{python_sitearch}/PIL/ImageTk*
|
||||||
%exclude %{python_sitearch}/PIL/_imagingtk*
|
%exclude %{python_sitearch}/PIL/_imagingtk*
|
||||||
%if 0%{?suse_version} > 1220
|
|
||||||
%ghost %{_sysconfdir}/alternatives/pilconvert
|
%ghost %{_sysconfdir}/alternatives/pilconvert
|
||||||
%ghost %{_sysconfdir}/alternatives/pildriver
|
%ghost %{_sysconfdir}/alternatives/pildriver
|
||||||
%ghost %{_sysconfdir}/alternatives/pilfile
|
%ghost %{_sysconfdir}/alternatives/pilfile
|
||||||
%ghost %{_sysconfdir}/alternatives/pilfont
|
%ghost %{_sysconfdir}/alternatives/pilfont
|
||||||
%ghost %{_sysconfdir}/alternatives/pilprint
|
%ghost %{_sysconfdir}/alternatives/pilprint
|
||||||
%endif
|
|
||||||
|
|
||||||
%files tk
|
%files tk
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
|
Loading…
Reference in New Issue
Block a user