From 2805dab5847ed95caa5ecd7ca231accf546088b6429972698525e8b669e88ebc Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Mon, 18 May 2015 13:38:36 +0000 Subject: [PATCH] Accepting request 307274 from home:benoit_monin:branches:devel:languages:python - update to version 4.1.0 - delete backup files found in the sources - remove unwanted shebang of python files - do not set the executable bit of python files - fix update-alternatives: add %{_sysconfdir}/alternatives/... - add new binary zeo-nagios - update documentation files: changed upstream OBS-URL: https://build.opensuse.org/request/show/307274 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ZEO?expand=0&rev=5 --- ZEO-4.0.0b1.tar.gz | 3 --- ZEO-4.1.0.tar.gz | 3 +++ python-ZEO.changes | 24 ++++++++++++++++++++++++ python-ZEO.spec | 37 +++++++++++++++++++++++++------------ 4 files changed, 52 insertions(+), 15 deletions(-) delete mode 100644 ZEO-4.0.0b1.tar.gz create mode 100644 ZEO-4.1.0.tar.gz diff --git a/ZEO-4.0.0b1.tar.gz b/ZEO-4.0.0b1.tar.gz deleted file mode 100644 index 706c2f4..0000000 --- a/ZEO-4.0.0b1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b6f8eaf2fac57f7b5ba16dac5c1a0d43d06683b1b5ba2e2906cb6bdfff883b2f -size 205692 diff --git a/ZEO-4.1.0.tar.gz b/ZEO-4.1.0.tar.gz new file mode 100644 index 0000000..d7ad65f --- /dev/null +++ b/ZEO-4.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:952998a28411eb1e7594b57e9c4fcb30a19ea38c0fec22abb339a844c3ca134f +size 242306 diff --git a/python-ZEO.changes b/python-ZEO.changes index 15f5c2f..ff7956e 100644 --- a/python-ZEO.changes +++ b/python-ZEO.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Fri May 15 09:53:55 UTC 2015 - benoit.monin@gmx.fr +- update to version 4.1.0: + * Add support for Python 3.4. + * Added a new ruok client protocol for getting server status on + the ZEO port without creating a full-blown client connection + and without logging in the server log. + * Log errors on server side even if using multi threaded delay. +- additional changes from version 4.0.0: + * Avoid reading excess random bytes when setting up an + auth_digest session. + * Optimize socket address enumeration in ZEO client (avoid + non-TCP types). + * Improve Travis CI testing support. + * Assign names to all threads for better runtime debugging. + * Fix "assignment to keyword" error under Py3k in + ‘ZEO.scripts.zeoqueue’. +- delete backup files found in the sources +- remove unwanted shebang of python files +- do not set the executable bit of python files +- fix update-alternatives: add %{_sysconfdir}/alternatives/... +- add new binary zeo-nagios +- update documentation files: changed upstream + ------------------------------------------------------------------- Sat Nov 08 17:19:00 UTC 2014 - Led diff --git a/python-ZEO.spec b/python-ZEO.spec index 66fde0f..3392eb9 100644 --- a/python-ZEO.spec +++ b/python-ZEO.spec @@ -1,7 +1,7 @@ # # spec file for package python-ZEO # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2013 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: python-ZEO -Version: 4.0.0b1 +Version: 4.1.0 Release: 0 Url: http://docs.pylonsproject.org Summary: Client-Server storage implementation for ZODB @@ -73,6 +73,10 @@ This package contains documentation files for %{name}. %prep %setup -q -n ZEO-%{version} +# delete backup files +find . -name "*~" -print -delete +# remove unwanted shebang +find src -name "*.py" | xargs sed -i '1 { /^#!/ d }' %build python setup.py build @@ -80,12 +84,12 @@ python setup.py build_sphinx && rm build/sphinx/html/.buildinfo %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} -chmod 755 %{buildroot}%{python_sitelib}/ZEO/scripts/{parsezeolog,timeout,zeoqueue,cache_simul}.py -chmod 755 %{buildroot}%{python_sitelib}/ZEO/scripts/{zeoserverlog,zeoreplay,zeopack,zeoup}.py -chmod 755 %{buildroot}%{python_sitelib}/ZEO/zeoctl.py -for fn in runzeo zeoctl zeopack zeopasswd; do +# 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} - ln -s %{_bindir}/$fn-%{py_ver} %{buildroot}%{_bindir}/$fn + touch %{buildroot}%{_sysconfdir}/alternatives/$fn + ln -s %{_sysconfdir}/alternatives/$fn %{buildroot}%{_bindir}/$fn done %check @@ -98,6 +102,7 @@ python setup.py test [ -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 %post update-alternatives \ @@ -105,6 +110,7 @@ update-alternatives \ --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 @@ -113,15 +119,22 @@ fi %files %defattr(-,root,root,-) -%doc CHANGES.txt COPYING COPYRIGHT.txt LICENSE.txt README.txt -%ghost %attr(0755,root,root) %{_bindir}/runzeo +%doc CHANGES.rst COPYRIGHT.txt LICENSE.txt README.rst +%ghost %{_sysconfdir}/alternatives/runzeo +%{_bindir}/runzeo %{_bindir}/runzeo-%{py_ver} -%ghost %attr(0755,root,root) %{_bindir}/zeoctl +%ghost %{_sysconfdir}/alternatives/zeoctl +%{_bindir}/zeoctl %{_bindir}/zeoctl-%{py_ver} -%ghost %attr(0755,root,root) %{_bindir}/zeopack +%ghost %{_sysconfdir}/alternatives/zeopack +%{_bindir}/zeopack %{_bindir}/zeopack-%{py_ver} -%ghost %attr(0755,root,root) %{_bindir}/zeopasswd +%ghost %{_sysconfdir}/alternatives/zeopasswd +%{_bindir}/zeopasswd %{_bindir}/zeopasswd-%{py_ver} +%ghost %{_sysconfdir}/alternatives/zeo-nagios +%{_bindir}/zeo-nagios +%{_bindir}/zeo-nagios-%{py_ver} %{python_sitelib}/ZEO %{python_sitelib}/ZEO-%{version}-py%{py_ver}.egg-info