Hello community, here is the log from the commit of package python-ZEO for openSUSE:Factory checked in at 2017-08-29 11:44:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-ZEO (Old) and /work/SRC/openSUSE:Factory/.python-ZEO.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-ZEO" Tue Aug 29 11:44:21 2017 rev:5 rq:518773 version:5.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-ZEO/python-ZEO.changes 2015-05-19 23:47:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-ZEO.new/python-ZEO.changes 2017-08-29 11:44:27.329153116 +0200 @@ -1,0 +2,19 @@ +Fri Aug 25 11:55:40 UTC 2017 - toddrme2178@gmail.com + +- Fix doc package dependencies + +------------------------------------------------------------------- +Mon Jul 17 17:56:44 UTC 2017 - toddrme2178@gmail.com + +- Use same package names from requires and buildrequires to avoid + packaging issues. + +------------------------------------------------------------------- +Sun Jul 9 06:01:33 UTC 2017 - aloisio@gmx.com + +- Update to version 5.1.0 (see CHANGES.rst) +- Converted to single-spec +- Added python-ZEO-rpmlintrc +- Enabled tests + +------------------------------------------------------------------- Old: ---- ZEO-4.1.0.tar.gz New: ---- ZEO-5.1.0.tar.gz python-ZEO-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-ZEO.spec ++++++ --- /var/tmp/diff_new_pack.hGT8kX/_old 2017-08-29 11:44:28.440996382 +0200 +++ /var/tmp/diff_new_pack.hGT8kX/_new 2017-08-29 11:44:28.448995254 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-ZEO # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2013 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties @@ -17,58 +17,63 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%bcond_without test Name: python-ZEO -Version: 4.1.0 +Version: 5.1.0 Release: 0 -Url: http://docs.pylonsproject.org Summary: Client-Server storage implementation for ZODB License: ZPL-2.1 Group: Development/Languages/Python -Source: http://pypi.python.org/packages/source/Z/ZEO/ZEO-%{version}.tar.gz +Url: http://docs.pylonsproject.org +Source: https://files.pythonhosted.org/packages/source/Z/ZEO/ZEO-%{version}.tar.gz +Source99: %{name}-rpmlintrc +BuildRequires: %{python_module ZConfig} +BuildRequires: %{python_module ZODB >= 5.1.1} +BuildRequires: %{python_module devel} +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module six} +BuildRequires: fdupes +BuildRequires: python-rpm-macros +# SECTION documentation requirements +BuildRequires: %{python_module Sphinx} +# /SECTION +%if %{with test} +BuildRequires: %{python_module manuel} +BuildRequires: %{python_module mock} +BuildRequires: %{python_module msgpack-python} +BuildRequires: %{python_module random2} +BuildRequires: %{python_module zodbpickle >= 0.6.0} +BuildRequires: %{python_module zope.testing} +BuildRequires: python-futures +BuildRequires: python-trollius +%endif Requires: python-ZConfig -Requires: python-ZODB >= 4.0.0 +Requires: python-ZODB >= 5.1.1 +Requires: python-six + Requires: python-persistent Requires: python-transaction +%ifpython2 +Requires: python-trollius +%endif Requires: python-zc.lockfile Requires: python-zdaemon Requires: python-zope.interface -BuildRequires: python-ZConfig -BuildRequires: python-ZODB >= 4.0.0 -BuildRequires: python-persistent -BuildRequires: python-transaction -BuildRequires: python-zc.lockfile -BuildRequires: python-zdaemon -BuildRequires: python-zope.interface - -BuildRequires: python-six -# Documentation requirements: -BuildRequires: python-Sphinx -# Testing requirements: -BuildRequires: python-manuel -BuildRequires: python-random2 -BuildRequires: python-zope.testing -BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): update-alternatives -Requires(postun): update-alternatives - -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -BuildRequires: python-ordereddict -BuildRequires: python-unittest2 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else +Requires(preun): update-alternatives BuildArch: noarch -%endif +%python_subpackages %description ZEO provides a client-server storage implementation for ZODB. - -%package doc +%package -n %{name}-doc Summary: Client-Server storage implementation for ZODB Group: Development/Languages/Python -Requires: %{name} = %{version} +Provides: %{python_module ZEO-doc = %{version}} -%description doc +%description -n %{name}-doc This package contains documentation files for %{name}. %prep @@ -77,68 +82,44 @@ find . -name "*~" -print -delete # remove unwanted shebang find src -name "*.py" | xargs sed -i '1 { /^#!/ d }' +rm -rf src/ZEO.egg-info %build -python setup.py build -python setup.py build_sphinx && rm build/sphinx/html/.buildinfo +%python_build +%{_python_use_flavor python3} +python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} -# for update-alternatives -mkdir -p %{buildroot}%{_sysconfdir}/alternatives -for fn in runzeo zeoctl zeopack zeopasswd zeo-nagios; do - mv %{buildroot}%{_bindir}/$fn %{buildroot}%{_bindir}/$fn-%{py_ver} - touch %{buildroot}%{_sysconfdir}/alternatives/$fn - ln -s %{_sysconfdir}/alternatives/$fn %{buildroot}%{_bindir}/$fn -done +%python_install +%python_expand %fdupes -s %{buildroot}%{$python_sitelib} -%check -python setup.py test +%python_clone -a %{buildroot}%{_bindir}/runzeo +%python_clone -a %{buildroot}%{_bindir}/zeoctl +%python_clone -a %{buildroot}%{_bindir}/zeopack +%python_clone -a %{buildroot}%{_bindir}/zeo-nagios -%pre -# Since binaries in /usr/bin became ghosted to be used with update-alternatives, we have -# to get rid of the old binaries resulting from the non-update-alternativies-ified package: -[ -h %{_bindir}/runzeo ] || rm -f %{_bindir}/runzeo -[ -h %{_bindir}/zeoctl ] || rm -f %{_bindir}/zeoctl -[ -h %{_bindir}/zeopack ] || rm -f %{_bindir}/zeopack -[ -h %{_bindir}/zeopasswd ] || rm -f %{_bindir}/zeopasswd -# not for zeo-nagios, it appeared after update-alternatives +%if %{with test} +%check +%python_exec setup.py test +%endif %post -update-alternatives \ - --install %{_bindir}/runzeo runzeo %{_bindir}/runzeo-%{py_ver} 20 \ - --slave %{_bindir}/zeoctl zeoctl %{_bindir}/zeoctl-%{py_ver} \ - --slave %{_bindir}/zeopack zeopack %{_bindir}/zeopack-%{py_ver} \ - --slave %{_bindir}/zeopasswd zeopasswd %{_bindir}/zeopasswd-%{py_ver} \ - --slave %{_bindir}/zeo-nagios zeo-nagios %{_bindir}/zeo-nagios-%{py_ver} - -%preun -if [ $1 -eq 0 ] ; then - update-alternatives --remove runzeo %{_bindir}/runzeo-%{py_ver} -fi +%python_install_alternative runzeo zeoctl zeopack zeo-nagios + +%postun +%python_uninstall_alternative runzeo -%files +%files %{python_files} %defattr(-,root,root,-) %doc CHANGES.rst COPYRIGHT.txt LICENSE.txt README.rst -%ghost %{_sysconfdir}/alternatives/runzeo -%{_bindir}/runzeo -%{_bindir}/runzeo-%{py_ver} -%ghost %{_sysconfdir}/alternatives/zeoctl -%{_bindir}/zeoctl -%{_bindir}/zeoctl-%{py_ver} -%ghost %{_sysconfdir}/alternatives/zeopack -%{_bindir}/zeopack -%{_bindir}/zeopack-%{py_ver} -%ghost %{_sysconfdir}/alternatives/zeopasswd -%{_bindir}/zeopasswd -%{_bindir}/zeopasswd-%{py_ver} -%ghost %{_sysconfdir}/alternatives/zeo-nagios -%{_bindir}/zeo-nagios -%{_bindir}/zeo-nagios-%{py_ver} +%python_alternative %{_bindir}/runzeo +%python_alternative %{_bindir}/zeoctl +%python_alternative %{_bindir}/zeopack +%python_alternative %{_bindir}/zeo-nagios %{python_sitelib}/ZEO -%{python_sitelib}/ZEO-%{version}-py%{py_ver}.egg-info +%{python_sitelib}/ZEO-%{version}-py%{python_version}.egg-info -%files doc +%files -n %{name}-doc %defattr(-,root,root,-) %doc build/sphinx/html ++++++ ZEO-4.1.0.tar.gz -> ZEO-5.1.0.tar.gz ++++++ ++++ 34004 lines of diff (skipped) ++++++ python-ZEO-rpmlintrc ++++++ # these are only shipped for testing purposes addFilter(".*ZEO/tests/.*pem$")