From e579dc79d61b9197cf837fd6bda476160ff446cb958d9ccad4dab89759860eba Mon Sep 17 00:00:00 2001 From: Kristyna Streitova Date: Tue, 11 Nov 2014 17:17:40 +0000 Subject: [PATCH] Accepting request 260560 from home:Ledest:misc fix bashisms in pre script OBS-URL: https://build.opensuse.org/request/show/260560 OBS-URL: https://build.opensuse.org/package/show/server:database/redis?expand=0&rev=54 --- redis.changes | 5 +++++ redis.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/redis.changes b/redis.changes index a69c4b1..d6b4a96 100644 --- a/redis.changes +++ b/redis.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Nov 09 23:34:00 UTC 2014 - Led + +- fix bashisms in pre script + ------------------------------------------------------------------- Mon Jul 28 09:10:30 UTC 2014 - mrueckert@suse.de diff --git a/redis.spec b/redis.spec index 839921f..e181053 100644 --- a/redis.spec +++ b/redis.spec @@ -1,7 +1,7 @@ # # spec file for package redis # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,8 +35,8 @@ Patch0: %{name}-initscript.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch1: %{name}-conf.patch Patch2: redis-enable-bactrace-on-x86-and-ia64-only.patch -BuildRequires: tcl BuildRequires: procps +BuildRequires: tcl Requires: logrotate BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -92,8 +92,8 @@ make test && true %endif %pre -/usr/sbin/groupadd -r %{name} &>/dev/null || : -/usr/sbin/useradd -g %{name} -s /bin/false -r -c "User for Redis key-value store" -d %{_data_dir} %{name} &>/dev/null || : +/usr/sbin/groupadd -r %{name} >/dev/null 2>&1 || : +/usr/sbin/useradd -g %{name} -s /bin/false -r -c "User for Redis key-value store" -d %{_data_dir} %{name} >/dev/null 2>&1 || : %post %fillup_and_insserv %{name}