Browse Source

updated 3 packages

numpy-1.16.5-1

python-pillow-6.2.0-3

python-rpm-macros-3-26

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12283 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 3 years ago
parent
commit
333ad5caa0

+ 175 - 69
n/numpy/numpy-vl.spec

@@ -1,34 +1,39 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%bcond_with check
+
 # eval to 2.3 if python isn't yet present, workaround for no python in fc4 minimal buildroot
 %{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]' || echo "2.3")}
 
 Name:           numpy
 Summary:        A fast multidimensional array facility for Python
-Version:        1.4.1
-Release:        9%{?_dist_release}
-
+Version:        1.16.5
+Release:        1%{?_dist_release}
 Group:          Development/Languages
-License:        BSD
-URL:            http://numeric.scipy.org/
 
-Source0:        http://downloads.sourceforge.net/numpy/%{name}-%{version}.tar.gz
-Patch0:         numpy-1.0.1-f2py.patch
-Patch1:         numpy_doublefree.patch
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
-# PyOS_ascii_strtod is deprecated in python 2.7, and the deprecation warning
-# outside of the GIL causes python to segfault (rhbz#617384)
-# Patch is a combination of upstream changeset 7926 followed by 8387
-Patch2:         numpy-1.4.1-remove-PyOS_ascii_strtod.patch
+License:        BSD and Python and ASL 2.0
+URL:            https://www.numpy.org/
+Source0:        https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
+Source1:        https://numpy.org/doc/1.17/numpy-html-1.16.0.zip
 
-## patches from debian
-Patch3:		changeset_r8510.diff
-Patch4:		changeset_r8511.diff
+Patch0:         numpy-1.0.1-f2py.patch
+Patch1:         numpy_doublefree.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
-#BuildRequires:  python-devel lapack-devel python-setuptools gcc-gfortran atlas-devel python-nose
-BuildRequires:  python-devel lapack-devel python-setuptools gcc-gfortran python-nose
-Requires:	python-nose
+BuildRequires:  python-devel
+BuildRequires:  python-rpm-macros
+BuildRequires:  python-setuptools
+%if %{with check}
+BuildRequires:  python-pytest
+%endif
+BuildRequires:  Cython
+BuildRequires:  gcc-gfortran gcc
+BuildRequires:  lapack-devel
+BuildRequires:  openblas-devel
+
+Requires:       %{name}-common
 
 %description
 NumPy is a general-purpose array-processing package designed to
@@ -42,49 +47,137 @@ There are also basic facilities for discrete fourier transform,
 basic linear algebra and random number generation. Also included in
 this package is a version of f2py that works properly with NumPy.
 
-%package f2py
+
+%package        common
+Summary:        common files for numpy
+Group:          Development/Libraries
+
+%description    common
+ This package includes header files for numpy.
+
+
+%package -n     python-numpy-f2py
 Summary:        f2py for numpy
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       python-devel
-Provides:       f2py
+Provides:       python-f2py = %{version}-%{release}
+Provides:       numpy-f2py = %{version}-%{release}
+Provides:       f2py = %{version}-%{release}
 Obsoletes:      f2py <= 2.45.241_1927
+Obsoletes:      numpy-f2py < 1.17.0
 
-%description f2py
+%description -n python-numpy-f2py
 This package includes a version of f2py that works properly with NumPy.
 
+
+%package -n     python3-numpy
+Summary:        A fast multidimensional array facility for Python
+
+License:        BSD
+%{?python_provide:%python_provide python3-numpy}
+Provides:       libnpymath-static = %{version}-%{release}
+Provides:       libnpymath-static%{?_isa} = %{version}-%{release}
+Requires:       %{name}-common = %{version}-%{release}
+
+BuildRequires:  python3-devel
+BuildRequires:  python3-rpm-macros
+BuildRequires:  python3-setuptools
+%if %{with check}
+BuildRequires:  python3-pytest
+%endif
+BuildRequires:  python3-Cython
+BuildRequires:  gcc-gfortran gcc
+BuildRequires:  lapack-devel
+BuildRequires:  openblas-devel
+
+%description -n python3-numpy
+NumPy is a general-purpose array-processing package designed to
+efficiently manipulate large multi-dimensional arrays of arbitrary
+records without sacrificing too much speed for small multi-dimensional
+arrays.  NumPy is built on the Numeric code base and adds features
+introduced by numarray as well as an extended C-API and the ability to
+create arrays of arbitrary type.
+
+There are also basic facilities for discrete fourier transform,
+basic linear algebra and random number generation. Also included in
+this package is a version of f2py that works properly with NumPy.
+
+
+%package -n     python3-numpy-f2py
+Summary:        f2py for numpy
+Requires:       python3-numpy%{?_isa} = %{version}-%{release}
+Requires:       python3-devel
+Provides:       python3-f2py = %{version}-%{release}
+Obsoletes:      python3-f2py <= 2.45.241_1927
+%{?python_provide:%python_provide python3-numpy-f2py}
+
+%description -n python3-numpy-f2py
+This package includes a version of f2py that works properly with NumPy.
+
+
+%package -n     python3-numpy-doc
+Summary:        Documentation for numpy
+Requires:       python3-numpy = %{version}-%{release}
+BuildArch:      noarch
+
+%description -n python3-numpy-doc
+This package provides the complete documentation for NumPy.
+
+
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .f2py
-%patch1 -p0 
-%patch2 -p1 -b .remove-PyOS_ascii_strtod
-%patch3 -p1 -b .r8510
-%patch4 -p1 -b .r8511
+
+# Force re-cythonization (ifed for PKG-INFO presence in setup.py)
+rm -f PKG-INFO
+
+# Use openblas pthreads as recommended by upstream (see comment in site.cfg.example)
+cat >> site.cfg <<EOF
+[openblas]
+libraries = openblasp
+library_dirs = %{_libdir}
+EOF
 
 %build
-env FFTW=%{_libdir} BLAS=%{_libdir} \
-    LAPACK=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" \
-    %{__python} setup.py build --fcompiler=gnu95
+
+env OPENBLAS=%{_libdir} \
+    BLAS=%{_libdir} \
+    LAPACK=%{_libdir} CFLAGS="%{optflags}" \
+    %{__python} setup.py build
+
+env OPENBLAS=%{_libdir} \
+    BLAS=%{_libdir} \
+    LAPACK=%{_libdir} CFLAGS="%{optflags}" \
+    %{__python3} setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-#%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-# skip-build currently broken, this works around it for now
-env ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} \
-    LAPACK=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" \
-    %{__python} setup.py install --root $RPM_BUILD_ROOT
-rm -rf docs-f2py ; mv $RPM_BUILD_ROOT%{python_sitearch}/%{name}/f2py/docs docs-f2py
-mv -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/f2py/f2py.1 f2py.1
-rm -rf doc ; mv -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/doc .
-install -D -p -m 0644 f2py.1 $RPM_BUILD_ROOT%{_mandir}/man1/f2py.1
-pushd $RPM_BUILD_ROOT%{_bindir} &> /dev/null
-# symlink for anyone who was using f2py.numpy
-ln -s f2py f2py.numpy
+rm -rf %{buildroot}
+
+mkdir docs
+pushd docs
+unzip %{SOURCE1}
+popd
+
+env OPENBLAS=%{_libdir} \
+    FFTW=%{_libdir} BLAS=%{_libdir} \
+    LAPACK=%{_libdir} CFLAGS="%{optflags}" \
+    %{__python} setup.py install --root %{buildroot}
+pushd %{buildroot}%{_bindir} &> /dev/null
+ln -s f2py2 f2py.numpy2
+popd &> /dev/null
+
+env OPENBLAS=%{_libdir} \
+    FFTW=%{_libdir} BLAS=%{_libdir} \
+    LAPACK=%{_libdir} CFLAGS="%{optflags}" \
+    %{__python3} setup.py install --root %{buildroot}
+pushd %{buildroot}%{_bindir} &> /dev/null
+ln -s f2py3 f2py.numpy
 popd &> /dev/null
 
 #symlink for includes, BZ 185079
-mkdir -p $RPM_BUILD_ROOT/usr/include
-ln -s %{python_sitearch}/%{name}/core/include/numpy/ $RPM_BUILD_ROOT/usr/include/numpy
+mkdir -p %{buildroot}%{_includedir}
+#ln -s %{python3_sitearch}/%{name}/core/include/numpy/ %{buildroot}%{_includedir}/numpy
+cp -rf %{buildroot}%{python3_sitearch}/%{name}/core/include/numpy %{buildroot}%{_includedir}/
 
 # Remove doc files. They should in in %doc
 rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/COMPATIBILITY
@@ -95,49 +188,62 @@ rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/README.txt
 rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/THANKS.txt
 rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/site.cfg.example
 
+%if %{with check}
 %check
 pushd doc &> /dev/null
 PYTHONPATH="%{buildroot}%{python_sitearch}" %{__python} -c "import pkg_resources, numpy ; numpy.test()" \
-%ifarch s390 s390x
-|| :
-%endif
 # don't remove this comment
 popd &> /dev/null
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%files common
+%{_includedir}/numpy
+
 %files
 %defattr(-,root,root,-)
-%doc docs-f2py doc/* LICENSE.txt README.txt THANKS.txt DEV_README.txt COMPATIBILITY site.cfg.example
+%license LICENSE.txt
+%doc THANKS.txt site.cfg.example
 %dir %{python_sitearch}/%{name}
-%{python_sitearch}/%{name}/*.py*
-%{python_sitearch}/%{name}/core
-%{python_sitearch}/%{name}/distutils
-%{python_sitearch}/%{name}/fft
-%{python_sitearch}/%{name}/lib
-%{python_sitearch}/%{name}/linalg
-%{python_sitearch}/%{name}/ma
-%{python_sitearch}/%{name}/numarray
-%{python_sitearch}/%{name}/oldnumeric
-%{python_sitearch}/%{name}/random
-%{python_sitearch}/%{name}/testing
-%{python_sitearch}/%{name}/tests
-%{python_sitearch}/%{name}/compat
-%{python_sitearch}/%{name}/matrixlib
-%{python_sitearch}/%{name}/polynomial
+%{python_sitearch}/%{name}/*
+%exclude %{python_sitearch}/%{name}/f2py
 %{python_sitearch}/%{name}-*.egg-info
-%{_includedir}/numpy
+%exclude %{python3_sitearch}/%{name}/LICENSE.txt
 
-%files f2py
+%files -n python-numpy-f2py
 %defattr(-,root,root,-)
-%{_mandir}/man*/*
+%{_bindir}/f2py2*
+%{_bindir}/f2py.numpy2
+%{python_sitearch}/%{name}/f2py
+
+
+%files -n python3-numpy
+%license LICENSE.txt
+%doc THANKS.txt site.cfg.example
+%dir %{python3_sitearch}/%{name}
+%{python3_sitearch}/%{name}/*
+%exclude %{python3_sitearch}/%{name}/f2py
+%{python3_sitearch}/%{name}-*.egg-info
+%exclude %{python3_sitearch}/%{name}/LICENSE.txt
+
+%files -n python3-numpy-f2py
 %{_bindir}/f2py
+%{_bindir}/f2py3
 %{_bindir}/f2py.numpy
-%{python_sitearch}/%{name}/f2py
+%{_bindir}/f2py%{python3_version}
+%{python3_sitearch}/%{name}/f2py
+
+%files -n python3-numpy-doc
+%doc docs/*
 
 
 %changelog
+* Wed Oct 23 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.16.5-1
+- new upstream release: this version is not newest but final version to suppot python2.
+- added python3 support.
+
 * Sun Feb 19 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.4.1-9
 - rebuild with python-2.7.2
 
@@ -275,7 +381,7 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Oct 25 2006 Jarod Wilson <jwilson@redhat.com> 1.0-1
 - New upstream release
 
-* Tue Sep 06 2006 Jarod Wilson <jwilson@redhat.com> 0.9.8-1
+* Wed Sep 06 2006 Jarod Wilson <jwilson@redhat.com> 0.9.8-1
 - New upstream release
 
 * Wed Apr 26 2006 Ignacio Vazquez-Abrams <ivazquez@ivazquez.net> 0.9.6-1

+ 626 - 0
p/python-pillow/python-pillow-vl.spec

@@ -0,0 +1,626 @@
+%global py2_incdir %(python2 -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())')
+%global py2_libbuilddir %(python2 -c 'import sys; import sysconfig; print("lib.{p}-{v[0]}.{v[1]}".format(p=sysconfig.get_platform(), v=sys.version_info))')
+
+%global with_python3 1
+%global py3_incdir %(python3 -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())')
+%global py3_libbuilddir %(python3 -c 'import sys; import sysconfig; print("lib.{p}-{v[0]}.{v[1]}".format(p=sysconfig.get_platform(), v=sys.version_info))')
+
+%global srcname pillow
+# bootstrap building docs (pillow is required by docutils, docutils are
+#  required by sphinx; pillow build-requires sphinx)
+%global with_docs 0
+
+Name:           python-%{srcname}
+Version:        6.2.0
+Release:        3%{?_dist_release}
+Summary:        Python image processing library
+Group:          Development/Libraries
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+# License: see http://www.pythonware.com/products/pil/license.htm
+License:        MIT
+URL:            http://python-pillow.github.io/
+Source0:        https://github.com/python-pillow/Pillow/archive/%{version}/Pillow-%{version}.tar.gz
+
+BuildRequires:  freetype2-devel
+BuildRequires:  gcc
+BuildRequires:  ghostscript
+BuildRequires:  lcms2-devel
+#BuildRequires:  libimagequant-devel
+BuildRequires:  libjpeg-devel
+#BuildRequires:  libraqm-devel
+BuildRequires:  libtiff-devel
+BuildRequires:  libwebp-devel
+BuildRequires:  openjpeg2-devel
+BuildRequires:  tk-devel
+BuildRequires:  zlib-devel
+
+BuildRequires:  python-devel
+BuildRequires:  numpy
+#BuildRequires:  python-olefile
+BuildRequires:  python-setuptools
+
+%if 0%{?with_python3}
+BuildRequires:  python3-rpm-macros
+BuildRequires:  python3-cffi
+BuildRequires:  python3-devel
+BuildRequires:  python3-numpy
+#BuildRequires:  python3-olefile
+BuildRequires:  python3-qt5
+BuildRequires:  python3-setuptools
+%if 0%{?with_docs}
+BuildRequires:  python3-sphinx
+BuildRequires:  python3-sphinx_rtd_theme
+%endif
+BuildRequires:  python3-tkinter
+%endif
+
+# For EpsImagePlugin.py
+Requires:       ghostscript
+%{?python_provide:%python_provide python2-%{srcname}}
+Obsoletes:      python-imaging < 1.2.0
+Provides:       python-imaging = %{version}-%{release}
+Provides:       python2-imaging = %{version}-%{release}
+# For MicImagePlugin.py, FpxImagePlugin.py
+#Requires:       python-olefile
+
+%global __provides_exclude_from ^%{python_sitearch}/PIL/.*\\.so$
+%global __provides_exclude_from ^%{python3_sitearch}/PIL/.*\\.so$
+
+%description
+Python image processing library, fork of the Python Imaging Library (PIL)
+
+This library provides extensive file format support, an efficient
+internal representation, and powerful image processing capabilities.
+
+There are four subpackages: tk (tk interface), qt (PIL image wrapper for Qt),
+devel (development) and doc (documentation).
+
+
+%package devel
+Summary:        Development files for %{srcname}
+Requires:       python-devel, libjpeg-devel, zlib-devel
+Requires:       python-%{srcname}%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python-%{srcname}-devel}
+Provides:       python-imaging-devel = %{version}-%{release}
+Provides:       python2-imaging-devel = %{version}-%{release}
+
+%description devel
+Development files for %{srcname}.
+
+
+%if 0%{?with_python3}
+%package -n python3-%{srcname}
+Summary:        Python 3 image processing library
+%{?python_provide:%python_provide python3-%{srcname}}
+Provides:       python3-imaging = %{version}-%{release}
+# For MicImagePlugin.py, FpxImagePlugin.py
+#Requires:       python3-olefile
+
+%description -n python3-%{srcname}
+Python image processing library, fork of the Python Imaging Library (PIL)
+
+This library provides extensive file format support, an efficient
+internal representation, and powerful image processing capabilities.
+
+There are four subpackages: tk (tk interface), qt (PIL image wrapper for Qt),
+devel (development) and doc (documentation).
+
+
+%package -n python3-%{srcname}-devel
+Summary:        Development files for %{srcname}
+Requires:       python3-devel, libjpeg-devel, zlib-devel
+Requires:       python3-%{srcname}%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python3-%{srcname}-devel}
+Provides:       python3-imaging-devel = %{version}-%{release}
+
+%description -n python3-%{srcname}-devel
+Development files for %{srcname}.
+
+
+%package -n python3-%{srcname}-doc
+Summary:        Documentation for %{srcname}
+BuildArch:      noarch
+Requires:       python3-%{srcname} = %{version}-%{release}
+%{?python_provide:%python_provide python3-%{srcname}-doc}
+Provides:       python3-imaging-doc = %{version}-%{release}
+Obsoletes:      python-%{srcname}-doc < 5.4.1-4
+
+%description -n python3-%{srcname}-doc
+Documentation for %{srcname}.
+
+
+%package -n python3-%{srcname}-tk
+Summary:        Tk interface for %{srcname}
+Requires:       python3-tkinter
+Requires:       python3-%{srcname}%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python3-%{srcname}-tk}
+Provides:       python3-imaging-tk = %{version}-%{release}
+
+%description -n python3-%{srcname}-tk
+Tk interface for %{name}.
+
+
+%package -n python3-%{srcname}-qt
+Summary:        Qt %{srcname} image wrapper
+Requires:       python3-qt5
+Requires:       python3-%{srcname}%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python3-%{srcname}-qt}
+Provides:       python3-imaging-qt = %{version}-%{release}
+
+%description -n python3-%{srcname}-qt
+Qt %{srcname} image wrapper.
+%endif
+
+
+%prep
+%autosetup -p1 -n Pillow-%{version}
+
+
+%build
+# Build Python 2 modules
+%py_build
+
+%if 0%{?with_python3}
+# Build Python 3 modules
+%py3_build
+
+%if 0%{?with_docs}
+PYTHONPATH=$PWD/build/%py3_libbuilddir make -C docs html BUILDDIR=_build_py3 SPHINXBUILD=sphinx-build-%python3_version
+rm -f docs/_build_py3/html/.buildinfo
+%endif
+%endif
+
+
+%install
+# Install Python 2 modules
+install -d %{buildroot}/%{py2_incdir}/Imaging
+install -m 644 src/libImaging/*.h %{buildroot}/%{py2_incdir}/Imaging
+%py_install
+
+%if 0%{?with_python3}
+# Install Python 3 modules
+install -d %{buildroot}/%{py3_incdir}/Imaging
+install -m 644 src/libImaging/*.h %{buildroot}/%{py3_incdir}/Imaging
+%py3_install
+%endif
+
+
+%check
+# Check Python 2 modules
+ln -s $PWD/Images $PWD/build/%py2_libbuilddir/Images
+cp -R $PWD/Tests $PWD/build/%py2_libbuilddir/Tests
+cp -R $PWD/selftest.py $PWD/build/%py2_libbuilddir/selftest.py
+pushd build/%py2_libbuilddir
+PYTHONPATH=$PWD %{__python} selftest.py
+popd
+
+%if 0%{?with_python3}
+# Check Python 3 modules
+ln -s $PWD/Images $PWD/build/%py3_libbuilddir/Images
+cp -R $PWD/Tests $PWD/build/%py3_libbuilddir/Tests
+cp -R $PWD/selftest.py $PWD/build/%py3_libbuilddir/selftest.py
+pushd build/%py3_libbuilddir
+PYTHONPATH=$PWD %{__python3} selftest.py
+popd
+%endif
+
+
+%files
+%doc README.rst CHANGES.rst
+%license docs/COPYING
+%{python_sitearch}/*
+# These are in subpackages
+%exclude %{python_sitearch}/PIL/_imagingtk*
+%exclude %{python_sitearch}/PIL/ImageTk*
+%exclude %{python_sitearch}/PIL/SpiderImagePlugin*
+%exclude %{python_sitearch}/PIL/ImageQt*
+
+%files devel
+%{py2_incdir}/Imaging/
+
+%if 0%{?with_python3}
+%files -n python3-%{srcname}
+%doc README.rst CHANGES.rst
+%license docs/COPYING
+%{python3_sitearch}/*
+# These are in subpackages
+%exclude %{python3_sitearch}/PIL/_imagingtk*
+%exclude %{python3_sitearch}/PIL/ImageTk*
+%exclude %{python3_sitearch}/PIL/SpiderImagePlugin*
+%exclude %{python3_sitearch}/PIL/ImageQt*
+%exclude %{python3_sitearch}/PIL/__pycache__/ImageTk*
+%exclude %{python3_sitearch}/PIL/__pycache__/SpiderImagePlugin*
+%exclude %{python3_sitearch}/PIL/__pycache__/ImageQt*
+
+%files -n python3-%{srcname}-devel
+%{py3_incdir}/Imaging/
+
+%files -n python3-%{srcname}-doc
+%if 0%{?with_docs}
+%doc docs/_build_py3/html
+%endif
+
+%files -n python3-%{srcname}-tk
+%{python3_sitearch}/PIL/_imagingtk*
+%{python3_sitearch}/PIL/ImageTk*
+%{python3_sitearch}/PIL/SpiderImagePlugin*
+%{python3_sitearch}/PIL/__pycache__/ImageTk*
+%{python3_sitearch}/PIL/__pycache__/SpiderImagePlugin*
+
+%files -n python3-%{srcname}-qt
+%{python3_sitearch}/PIL/ImageQt*
+%{python3_sitearch}/PIL/__pycache__/ImageQt*
+%endif
+
+
+%changelog
+* Wed Oct 23 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 6.2.0-3
+- initial build for Vine Linux.
+
+* Mon Oct 07 2019 Petr Viktorin <pviktori@redhat.com> - 6.2.0-2
+- Remove optional build dependency on python2-cffi
+
+* Tue Oct 01 2019 Sandro Mani <manisandro@gmail.com> - 6.2.0-1
+- Update to 6.2.0
+
+* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 6.1.0-4
+- Rebuilt for Python 3.8
+
+* Mon Aug 12 2019 Sandro Mani <manisandro@gmail.com> - 6.1.0-3
+- Drop python2-pillow-qt, python2-pillow-tk
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Jul 01 2019 Sandro Mani <manisandro@gmail.com> - 6.1.0-1
+- Update to 6.1.0
+
+* Fri May 31 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 6.0.0-2
+- Fix broken Python/C interop on s390x
+
+* Tue Apr 02 2019 Sandro Mani <manisandro@gmail.com> - 6.0.0-1
+- Update to 6.0.0
+
+* Sun Mar 10 2019 Sandro Mani <manisandro@gmail.com> - 5.4.1-4
+- Drop python2-pillow-doc
+
+* Mon Mar 04 2019 Yatin Karel <ykarel@redhat.com> - 5.4.1-3
+- Fix python3 conditional
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jan 07 2019 Sandro Mani <manisandro@gmail.com> - 5.4.1-1
+- Update to 5.4.1
+
+* Mon Oct 01 2018 Sandro Mani <manisandro@gmail.com> - 5.3.0-1
+- Update to 5.3.0
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 5.2.0-2
+- Rebuilt for Python 3.7
+
+* Mon Jul 02 2018 Sandro Mani <manisandro@gmail.com> - 5.2.0-1
+- Update to 5.2.0
+
+* Wed Jun 27 2018 Miro Hrončok <mhroncok@redhat.com> - 5.1.1-3
+- Fix the tkinter dependency
+
+* Sat Jun 16 2018 Miro Hrončok <mhroncok@redhat.com> - 5.1.1-2
+- Rebuilt for Python 3.7
+
+* Wed Apr 25 2018 Sandro Mani <manisandro@gmail.com> - 5.1.1-1
+- Update to 5.1.1
+
+* Thu Apr 05 2018 Sandro Mani <manisandro@gmail.com> - 5.1.0-1
+- Update to 5.1.0
+
+* Wed Mar 07 2018 Sandro Mani <manisandro@gmail.com> - 5.0.0-3
+- Add missing BR: gcc
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Jan 03 2018 Sandro Mani <manisandro@gmail.com> - 5.0.0-1
+- Update to 5.0.0
+
+* Tue Oct 03 2017 Sandro Mani <manisandro@gmail.com> - 4.3.0-1
+- Update to 4.3.0
+
+* Tue Sep 05 2017 Troy Dawson <tdawson@redhat.com> - 4.2.1-5
+- Cleanup spec file conditionals
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Jul 07 2017 Igor Gnatenko <ignatenko@redhat.com> - 4.2.1-2
+- Rebuild due to bug in RPM (RHBZ #1468476)
+
+* Thu Jul 06 2017 Sandro Mani <manisandro@gmail.com> - 4.2.1-1
+- Update to 4.2.1
+
+* Sat Jul 01 2017 Sandro Mani <manisandro@gmail.com> - 4.2.0-1
+- Update to 4.2.0
+
+* Fri Apr 28 2017 Sandro Mani <manisandro@gmail.com> - 4.1.1-1
+- Update to 4.1.1
+
+* Wed Apr 05 2017 Sandro Mani <manisandro@gmail.com> - 4.1.0-1
+- Update to 4.1.0
+
+* Wed Feb 15 2017 Sandro Mani <manisandro@gmail.com> - 4.0.0-3
+- Fix some __pycache__ files in wrong subpackage (#1422606)
+
+* Wed Feb 01 2017 Sandro Mani <manisandro@gmail.com> - 4.0.0-2
+- Rebuild (libwebp)
+
+* Tue Jan 03 2017 Sandro Mani <manisandro@gmail.com> - 4.0.0-1
+- Update to 4.0.0
+
+* Mon Dec 12 2016 Miro Hrončok <mhroncok@redhat.com> - 3.4.2-3
+- Enable docs build
+
+* Mon Dec 12 2016 Miro Hrončok <mhroncok@redhat.com> - 3.4.2-2
+- Rebuild for Python 3.6
+
+* Wed Oct 19 2016 Sandro Mani <manisandro@gmail.com> - 3.4.2-1
+- Update to 3.4.2
+
+* Tue Oct 04 2016 Sandro Mani <manisandro@gmail.com> - 3.4.1-1
+- Update to 3.4.1
+
+* Mon Oct 03 2016 Sandro Mani <manisandro@gmail.com> - 3.4.0-1
+- Update to 3.4.0
+
+* Thu Aug 18 2016 Sandro Mani <manisandro@gmail.com> - 3.3.1-1
+- Update  to 3.3.1
+
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.0-2
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
+* Sat Jul 02 2016 Sandro Mani <manisandro@gmail.com> - 3.3.0-1
+- Update to 3.3.0
+- Modernize spec
+
+* Fri Apr 01 2016 Sandro Mani <manisandro@gmail.com> - 3.2.0-1
+- Update to 3.2.0
+
+* Wed Feb 10 2016 Sandro Mani <manisandro@gmail.com> - 3.1.1-3
+- Fix broken python3-pillow package description
+
+* Sun Feb 07 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 3.1.1-2
+- Fix provides
+
+* Thu Feb 04 2016 Sandro Mani <manisandro@gmail.com> - 3.1.1-1
+- Update to 3.1.1
+- Fixes CVE-2016-0740, CVE-2016-0775
+
+* Mon Jan 11 2016 Toshio Kuratomi <toshio@fedoraproject.org> - 3.1.0-2
+- Fix executable files in doc package bringing in python 2 for the python3 doc
+  packages
+
+* Mon Jan 04 2016 Sandro Mani <manisandro@gmail.com> - 3.1.0-1
+- Update to 3.1.0
+
+* Tue Dec 29 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 3.0.0-5
+- Build with docs
+
+* Mon Dec 28 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 3.0.0-4
+- Rebuilt for libwebp soname bump
+
+* Wed Oct 14 2015 Robert Kuska <rkuska@redhat.com> - 3.0.0-3
+- Rebuilt for Python3.5 rebuild with docs
+
+* Tue Oct 13 2015 Robert Kuska <rkuska@redhat.com> - 3.0.0-2
+- Rebuilt for Python3.5 rebuild without docs
+
+* Fri Oct 02 2015 Sandro Mani <manisandro@gmail.com> - 3.0.0-1
+- Update to 3.0.0
+
+* Wed Jul 29 2015 Sandro Mani <manisandro@gmail.com> - 2.9.0-2
+- Fix python3-pillow-tk Requires: tkinter -> python3-tkinter (#1248085)
+
+* Thu Jul 02 2015 Sandro Mani <manisandro@gmail.com> - 2.9.0-1
+- Update to 2.9.0
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Mon Jun 08 2015 Sandro Mani <manisandro@gmail.com> - 2.8.2-1
+- Update to 2.8.2
+
+* Thu Apr 02 2015 Sandro Mani <manisandro@gmail.com> - 2.8.1-1
+- Update to 2.8.1
+
+* Wed Apr 01 2015 Sandro Mani <manisandro@gmail.com> - 2.8.0-1
+- Update to 2.8.0
+
+* Mon Jan 12 2015 Sandro Mani <manisandro@gmail.com> - 2.7.0-1
+- Update to 2.7.0
+- Drop sane subpackage, is in python-sane now
+- Fix python3 headers directory
+- Drop Obsoletes: python3-pillow on python3-pillow-qt
+
+* Mon Oct 13 2014 Sandro Mani <manisandro@gmail.com> - 2.6.1-1
+- Update to 2.6.1
+
+* Thu Oct 02 2014 Sandro Mani <manisandro@gmail.com> - 2.6.0-1
+- Update to 2.6.0
+
+* Wed Aug 20 2014 Sandro Mani <manisandro@gmail.com> - 2.5.3-3
+- Rebuilding again to resolve transient build error that caused BZ#1131723
+
+* Tue Aug 19 2014 Stephen Gallagher <sgallagh@redhat.com> - 2.5.3-2
+- Rebuilding to resolve transient build error that caused BZ#1131723
+
+* Tue Aug 19 2014 Sandro Mani <manisandro@gmail.com> - 2.5.3-1
+- Update to 2.5.3 (Fix CVE-2014-3598, a DOS in the Jpeg2KImagePlugin)
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Wed Aug 13 2014 Sandro Mani <manisandro@gmail.com> - 2.5.2-1
+- Update to 2.5.2 (Fix CVE-2014-3589, a DOS in the IcnsImagePlugin)
+
+* Sat Jul 26 2014 Sandro Mani <manisandro@gmail.com> - 2.5.1-2
+- Reenable jpeg2k tests on big endian arches
+
+* Tue Jul 15 2014 Sandro Mani <manisandro@gmail.com> - 2.5.1-1
+- Update to 2.5.1
+
+* Wed Jul 02 2014 Sandro Mani <manisandro@gmail.com> - 2.5.0-1
+- Update to 2.5.0
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Wed May 28 2014 Sandro Mani <manisandro@gmail.com> - 2.4.0-10
+- Rebuild with docs enabled
+- Update python-pillow_openjpeg-2.1.0.patch
+
+* Tue May 27 2014 Sandro Mani <manisandro@gmail.com> - 2.4.0-9
+- Rebuild against openjpeg-2.1.0
+
+* Fri May 23 2014 Dan Horák <dan[at]danny.cz> - 2.4.0-8
+- skip jpeg2k tests on big endian arches (#1100762)
+
+* Wed May 21 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2.4.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86
+
+* Tue May 13 2014 Bohuslav Kabrda <bkabrda@redhat.com> - 2.4.0-6
+- Set with_docs to 1 to build docs.
+
+* Tue May 13 2014 Bohuslav Kabrda <bkabrda@redhat.com> - 2.4.0-5
+- Bootstrap building sphinx docs because of circular dependency with sphinx.
+
+* Fri May  9 2014 Orion Poplawski <orion@cora.nwra.com> - 2.4.0-4
+- Rebuild for Python 3.4
+
+* Tue Apr 22 2014 Sandro Mani <manisandro@gmail.com> - 2.4.0-3
+- Add patch: Have the tempfile use a suffix with a dot
+
+* Thu Apr 17 2014 Sandro Mani <manisandro@gmail.com> - 2.4.0-2
+- Enable Jpeg2000 support
+- Enable webp support also on s390* archs, bug #962091 is now fixed
+- Add upstream patch for ghostscript detection
+
+* Wed Apr 02 2014 Sandro Mani <manisandro@gmail.com> - 2.4.0-1
+- Update to 2.4.0
+
+* Wed Mar 19 2014 Sandro Mani <manisandro@gmail.com> - 2.3.1-1
+- Update to 2.3.1 (Fix insecure use of tempfile.mktemp (CVE-2014-1932 CVE-2014-1933))
+
+* Thu Mar 13 2014 Jakub Dorňák <jdornak@redhat.com> - 2.3.0-5
+- python-pillow does not provide python3-imaging
+  (python3-pillow does)
+
+* Tue Jan 07 2014 Sandro Mani <manisandro@gmail.com> - 2.3.0-4
+- Add missing ghostscript Requires and BuildRequires
+
+* Mon Jan 06 2014 Sandro Mani <manisandro@gmail.com> - 2.3.0-3
+- Remove python-pillow_help-theme.patch, add python-sphinx-theme-better BR
+
+* Sun Jan 05 2014 Sandro Mani <manisandro@gmail.com> - 2.3.0-2
+- Rebuild with docs enabled
+- Change lcms BR to lcms2
+
+* Thu Jan 02 2014 Sandro Mani <manisandro@gmail.com> - 2.3.0-1
+- Update to 2.3.0
+- Build with doc disabled to break circular python-pillow -> python-sphinx -> python pillow dependency
+
+* Wed Oct 23 2013 Sandro Mani <manisandro@gmail.com> - 2.2.1-2
+- Backport fix for decoding tiffs with correct byteorder, fixes rhbz#1019656
+
+* Wed Oct 02 2013 Sandro Mani <manisandro@gmail.com> - 2.2.1-1
+- Update to 2.2.1
+- Really enable webp on ppc, but leave disabled on s390
+
+* Thu Aug 29 2013 Sandro Mani <manisandro@gmail.com> - 2.1.0-4
+- Add patch to fix incorrect PyArg_ParseTuple tuple signature, fixes rhbz#962091 and rhbz#988767.
+- Renable webp support on bigendian arches
+
+* Wed Aug 28 2013 Sandro Mani <manisandro@gmail.com> - 2.1.0-3
+- Add patch to fix memory corruption caused by invalid palette size, see rhbz#1001122
+
+* Tue Jul 30 2013 Karsten Hopp <karsten@redhat.com> 2.1.0-2
+- Build without webp support on ppc* archs (#988767)
+
+* Wed Jul 03 2013 Sandro Mani <manisandro@gmail.com> - 2.1.0-1
+- Update to 2.1.0
+- Run tests in builddir, not installroot
+- Build python3-pillow docs with python3
+- python-pillow_endian.patch upstreamed
+
+* Mon May 13 2013 Roman Rakus <rrakus@redhat.com> - 2.0.0-10
+- Build without webp support on s390* archs
+  Resolves: rhbz#962059
+
+* Sat May 11 2013 Roman Rakus <rrakus@redhat.com> - 2.0.0-9.gitd1c6db8
+- Conditionaly disable build of python3 parts on RHEL system
+
+* Wed May 08 2013 Sandro Mani <manisandro@gmail.com> - 2.0.0-8.gitd1c6db8
+- Add patch to fix test failure on big-endian
+
+* Thu Apr 25 2013 Toshio Kuratomi <toshio@fedoraproject.org> - 2.0.0-7.gitd1c6db8
+- Remove Obsoletes in the python-pillow-qt subpackage. Obsoletes isn't
+  appropriate since qt support didn't exist in the previous python-pillow
+  package so there's no reason to drag in python-pillow-qt when updating
+  python-pillow.
+
+* Fri Apr 19 2013 Sandro Mani <manisandro@gmail.com> - 2.0.0-6.gitd1c6db8
+- Update to latest git
+- python-pillow_quantization.patch now upstream
+- python-pillow_endianness.patch now upstream
+- Add subpackage for ImageQt module, with correct dependencies
+- Add PyQt4 and numpy BR (for generating docs / running tests)
+
+* Mon Apr 08 2013 Sandro Mani <manisandro@gmail.com> - 2.0.0-5.git93a488e
+- Reenable tests on bigendian, add patches for #928927
+
+* Sun Apr 07 2013 Sandro Mani <manisandro@gmail.com> - 2.0.0-4.git93a488e
+- Update to latest git
+- disable tests on bigendian (PPC*, S390*) until rhbz#928927 is fixed
+
+* Fri Mar 22 2013 Sandro Mani <manisandro@gmail.com> - 2.0.0-3.gitde210a2
+- python-pillow_tempfile.patch now upstream
+- Add python3-imaging provides (bug #924867)
+
+* Fri Mar 22 2013 Sandro Mani <manisandro@gmail.com> - 2.0.0-2.git2e88848
+- Update to latest git
+- Remove python-pillow-disable-test.patch, gcc is now fixed
+- Add python-pillow_tempfile.patch to prevent a temporary file from getting packaged
+
+* Tue Mar 19 2013 Sandro Mani <manisandro@gmail.com> - 2.0.0-1.git2f4207c
+- Update to 2.0.0 git snapshot
+- Enable python3 packages
+- Add libwebp-devel BR for Pillow 2.0.0
+
+* Wed Mar 13 2013 Peter Robinson <pbrobinson@fedoraproject.org> 1.7.8-6.20130305git
+- Add ARM support
+
+* Tue Mar 12 2013 Karsten Hopp <karsten@redhat.com> 1.7.8-5.20130305git
+- add s390* and ppc* to arch detection
+
+* Tue Mar 05 2013 Sandro Mani <manisandro@gmail.com> - 1.7.8-4.20130305git7866759
+- Update to latest git snapshot
+- 0001-Cast-hash-table-values-to-unsigned-long.patch now upstream
+- Pillow-1.7.8-selftest.patch now upstream
+
+* Mon Feb 25 2013 Sandro Mani <manisandro@gmail.com> - 1.7.8-3.20130210gite09ff61
+- Really remove -fno-strict-aliasing
+- Place comment on how to retreive source just above the Source0 line
+
+* Mon Feb 18 2013 Sandro Mani <manisandro@gmail.com> - 1.7.8-2.20130210gite09ff61
+- Rebuild without -fno-strict-aliasing
+- Add patch for upstream issue #52
+
+* Sun Feb 10 2013 Sandro Mani <manisandro@gmail.com> - 1.7.8-1.20130210gite09ff61
+- Initial RPM package

+ 10 - 2
p/python-rpm-macros/python-rpm-macros-vl.spec

@@ -2,7 +2,7 @@
 
 Name:           python-rpm-macros
 Version:        3
-Release:        25%{?_dist_release}
+Release:        26%{?_dist_release}
 Summary:        The unversioned Python RPM macros
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -38,6 +38,8 @@ RPM macros for building Python source packages.
 Summary:        RPM macros for building Python 2 packages
 # Would need to be different for each release - worth it?
 #Conflicts:      python2-devel < 2.7.11-3
+Requires:       python-rpm-macros
+Requires:       python-srpm-macros
 
 %description -n python2-rpm-macros
 RPM macros for building Python 2 packages.
@@ -46,6 +48,8 @@ RPM macros for building Python 2 packages.
 Summary:        RPM macros for building Python 3 packages
 # Would need to be different for each release - worth it?
 #Conflicts:      python3-devel < 3.5.1-3
+Requires:       python-rpm-macros
+Requires:       python-srpm-macros
 
 %description -n python3-rpm-macros
 RPM macros for building Python 3 packages.
@@ -81,10 +85,14 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
 
 #%files -n platform-python-rpm-macros
 #%{rpmmacrodir}/macros.platform-python
+%exclude %{rpmmacrodir}/macros.platform-python
 
 
 %changelog
-* Mon Dec 18 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.25
+* Wed Oct 23 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3-26
+- updated macros.
+
+* Mon Dec 18 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3-25
 - fixed a typo.
 
 * Wed Sep 20 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3-24