From c001d975a9f8f4974febb3d2de0ca6a0f365c2a5b21e59ef0f1e9011b2516940 Mon Sep 17 00:00:00 2001 From: Denisart Benjamin Date: Fri, 14 Nov 2014 15:27:34 +0000 Subject: [PATCH] Accepting request 260364 from home:Ledest:misc fix bashism in pre script OBS-URL: https://build.opensuse.org/request/show/260364 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ZEO?expand=0&rev=3 --- python-ZEO.changes | 5 +++++ python-ZEO.spec | 30 +++++++++++++++--------------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/python-ZEO.changes b/python-ZEO.changes index 31a61fb..15f5c2f 100644 --- a/python-ZEO.changes +++ b/python-ZEO.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Nov 08 17:19:00 UTC 2014 - Led + +- fix bashism in pre script + ------------------------------------------------------------------- Tue Sep 10 08:24:46 UTC 2013 - hpj@urpla.net diff --git a/python-ZEO.spec b/python-ZEO.spec index f1f751c..66fde0f 100644 --- a/python-ZEO.spec +++ b/python-ZEO.spec @@ -1,7 +1,7 @@ # # spec file for package python-ZEO # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties @@ -16,6 +16,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python-ZEO Version: 4.0.0b1 Release: 0 @@ -24,18 +25,18 @@ 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 -Requires: python-ZODB >= 4.0.0 -Requires: python-transaction -Requires: python-persistent -Requires: python-zc.lockfile Requires: python-ZConfig +Requires: python-ZODB >= 4.0.0 +Requires: python-persistent +Requires: python-transaction +Requires: python-zc.lockfile Requires: python-zdaemon Requires: python-zope.interface -BuildRequires: python-ZODB >= 4.0.0 -BuildRequires: python-transaction -BuildRequires: python-persistent -BuildRequires: python-zc.lockfile 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 @@ -43,9 +44,9 @@ BuildRequires: python-six # Documentation requirements: BuildRequires: python-Sphinx # Testing requirements: -BuildRequires: python-zope.testing BuildRequires: python-manuel BuildRequires: python-random2 +BuildRequires: python-zope.testing BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): update-alternatives Requires(postun): update-alternatives @@ -93,11 +94,10 @@ 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: -[[ ! -L %{_bindir}/runzeo ]] && rm -f %{_bindir}/runzeo -[[ ! -L %{_bindir}/zeoctl ]] && rm -f %{_bindir}/zeoctl -[[ ! -L %{_bindir}/zeopack ]] && rm -f %{_bindir}/zeopack -[[ ! -L %{_bindir}/zeopasswd ]] && rm -f %{_bindir}/zeopasswd -exit 0 +[ -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 %post update-alternatives \