From b0eee8799a185549c6b2c28f94f8631c3a1fe9ff30458ece8bc3da0703b33988 Mon Sep 17 00:00:00 2001 From: Thomas Bechtold Date: Mon, 10 Jul 2017 08:56:23 +0000 Subject: [PATCH 1/3] Accepting request 508985 from home:alois:branches:devel:languages:python OBS-URL: https://build.opensuse.org/request/show/508985 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ZEO?expand=0&rev=7 --- ZEO-4.1.0.tar.gz | 3 - ZEO-5.1.0.tar.gz | 3 + python-ZEO-rpmlintrc | 2 + python-ZEO.changes | 8 +++ python-ZEO.spec | 134 ++++++++++++++++++------------------------- 5 files changed, 68 insertions(+), 82 deletions(-) delete mode 100644 ZEO-4.1.0.tar.gz create mode 100644 ZEO-5.1.0.tar.gz create mode 100644 python-ZEO-rpmlintrc diff --git a/ZEO-4.1.0.tar.gz b/ZEO-4.1.0.tar.gz deleted file mode 100644 index d7ad65f..0000000 --- a/ZEO-4.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:952998a28411eb1e7594b57e9c4fcb30a19ea38c0fec22abb339a844c3ca134f -size 242306 diff --git a/ZEO-5.1.0.tar.gz b/ZEO-5.1.0.tar.gz new file mode 100644 index 0000000..ea2e65d --- /dev/null +++ b/ZEO-5.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:142edf8fcabaeec8c438319d71a12a1d4461befa9111a073c362b75e481e7522 +size 266903 diff --git a/python-ZEO-rpmlintrc b/python-ZEO-rpmlintrc new file mode 100644 index 0000000..0046e59 --- /dev/null +++ b/python-ZEO-rpmlintrc @@ -0,0 +1,2 @@ +# these are only shipped for testing purposes +addFilter(".*ZEO/tests/.*pem$") diff --git a/python-ZEO.changes b/python-ZEO.changes index ff7956e..a2c58b3 100644 --- a/python-ZEO.changes +++ b/python-ZEO.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Fri May 15 09:53:55 UTC 2015 - benoit.monin@gmx.fr - update to version 4.1.0: diff --git a/python-ZEO.spec b/python-ZEO.spec index 3392eb9..3db55ca 100644 --- a/python-ZEO.spec +++ b/python-ZEO.spec @@ -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,60 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} 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 devel} +# SECTION documentation requirements +BuildRequires: %{python_module Sphinx} +BuildRequires: %{python_module ZConfig} +BuildRequires: %{python_module ZODB >= 4.0.0} +# /SECTION +# SECTION testing requirements +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: python2-futures +BuildRequires: python2-trollius +# /SECTION +BuildRequires: fdupes +BuildRequires: python-rpm-macros Requires: python-ZConfig Requires: python-ZODB >= 4.0.0 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 +BuildRoot: %{_tmppath}/%{name}-%{version}-build 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 +Provides: %{python_module ZEO-doc = %{version}} Requires: %{name} = %{version} -%description doc +%description -n %{name}-doc This package contains documentation files for %{name}. %prep @@ -77,68 +79,42 @@ This package contains documentation files for %{name}. 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} + +%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 %check -python setup.py test - -%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 +%python_exec setup.py test %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} +%python_install_alternative runzeo zeoctl zeopack zeo-nagios -%preun -if [ $1 -eq 0 ] ; then - update-alternatives --remove runzeo %{_bindir}/runzeo-%{py_ver} -fi +%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 From 55bfeddb8d5d5d623b291d29d684e5c67fae783b3158f9ef253a37a8addfccda Mon Sep 17 00:00:00 2001 From: Todd R Date: Mon, 17 Jul 2017 17:57:29 +0000 Subject: [PATCH 2/3] Accepting request 511030 from home:TheBlackCat:branches:devel:languages:python - Use same package names from requires and buildrequires to avoid packaging issues. OBS-URL: https://build.opensuse.org/request/show/511030 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ZEO?expand=0&rev=8 --- python-ZEO.changes | 6 ++++++ python-ZEO.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/python-ZEO.changes b/python-ZEO.changes index a2c58b3..a2bd889 100644 --- a/python-ZEO.changes +++ b/python-ZEO.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/python-ZEO.spec b/python-ZEO.spec index 3db55ca..36baad4 100644 --- a/python-ZEO.spec +++ b/python-ZEO.spec @@ -40,8 +40,8 @@ BuildRequires: %{python_module msgpack-python} BuildRequires: %{python_module random2} BuildRequires: %{python_module zodbpickle >= 0.6.0} BuildRequires: %{python_module zope.testing} -BuildRequires: python2-futures -BuildRequires: python2-trollius +BuildRequires: python-futures +BuildRequires: python-trollius # /SECTION BuildRequires: fdupes BuildRequires: python-rpm-macros From 133c50248220ba938987a408b065ba1766d0b4f5a5785b8a56c490fd767a520b Mon Sep 17 00:00:00 2001 From: Todd R Date: Fri, 25 Aug 2017 14:45:42 +0000 Subject: [PATCH 3/3] Accepting request 518772 from home:TheBlackCat:branches:devel:languages:python - Fix doc package dependencies OBS-URL: https://build.opensuse.org/request/show/518772 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ZEO?expand=0&rev=9 --- python-ZEO.changes | 5 +++++ python-ZEO.spec | 23 ++++++++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/python-ZEO.changes b/python-ZEO.changes index a2bd889..5df25ba 100644 --- a/python-ZEO.changes +++ b/python-ZEO.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/python-ZEO.spec b/python-ZEO.spec index 36baad4..f1c7017 100644 --- a/python-ZEO.spec +++ b/python-ZEO.spec @@ -18,6 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%bcond_without test Name: python-ZEO Version: 5.1.0 Release: 0 @@ -27,13 +28,17 @@ Group: Development/Languages/Python 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} -BuildRequires: %{python_module ZConfig} -BuildRequires: %{python_module ZODB >= 4.0.0} # /SECTION -# SECTION testing requirements +%if %{with test} BuildRequires: %{python_module manuel} BuildRequires: %{python_module mock} BuildRequires: %{python_module msgpack-python} @@ -42,11 +47,11 @@ BuildRequires: %{python_module zodbpickle >= 0.6.0} BuildRequires: %{python_module zope.testing} BuildRequires: python-futures BuildRequires: python-trollius -# /SECTION -BuildRequires: fdupes -BuildRequires: python-rpm-macros +%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 @@ -57,7 +62,6 @@ Requires: python-zdaemon Requires: python-zope.interface Requires(post): update-alternatives Requires(preun): update-alternatives -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %python_subpackages @@ -68,7 +72,6 @@ ZEO provides a client-server storage implementation for ZODB. Summary: Client-Server storage implementation for ZODB Group: Development/Languages/Python Provides: %{python_module ZEO-doc = %{version}} -Requires: %{name} = %{version} %description -n %{name}-doc This package contains documentation files for %{name}. @@ -95,8 +98,10 @@ python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo %python_clone -a %{buildroot}%{_bindir}/zeopack %python_clone -a %{buildroot}%{_bindir}/zeo-nagios +%if %{with test} %check %python_exec setup.py test +%endif %post %python_install_alternative runzeo zeoctl zeopack zeo-nagios