From 12c9a7c5cec2524a0e46438e2ea45dde19ee5578837854c547cd96b6d4054397 Mon Sep 17 00:00:00 2001
From: Darin Perusich <darin@darins.net>
Date: Mon, 10 Nov 2014 17:41:24 +0000
Subject: [PATCH] Accepting request 260567 from home:Ledest:misc

fix bashisms in pre script

OBS-URL: https://build.opensuse.org/request/show/260567
OBS-URL: https://build.opensuse.org/package/show/server:dns/unbound?expand=0&rev=13
---
 unbound.changes |  5 +++++
 unbound.spec    | 29 ++++++++++++++++++-----------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/unbound.changes b/unbound.changes
index 2b2bb11..8870e89 100644
--- a/unbound.changes
+++ b/unbound.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov 10 00:45:00 UTC 2014 - Led <ledest@gmail.com>
+
+- fix bashisms in pre script
+
 -------------------------------------------------------------------
 Fri Sep  5 13:32:55 UTC 2014 - darin@darins.net
 
diff --git a/unbound.spec b/unbound.spec
index f367f1c..44ccf98 100644
--- a/unbound.spec
+++ b/unbound.spec
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %bcond_without python
 %bcond_without munin
 %bcond_without hardened_build
@@ -49,16 +50,14 @@ Name:           unbound
 Version:        1.4.22
 Release:        0
 #
-Group:          Productivity/Networking/DNS/Servers
-License:        BSD-3-Clause
 #
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  flex
-BuildRequires:  openssl-devel
-BuildRequires:  libevent-devel
 BuildRequires:  ldns-devel >= %{ldns_version}
-BuildRequires:  python-devel
+BuildRequires:  libevent-devel
 BuildRequires:  libexpat-devel
+BuildRequires:  openssl-devel
+BuildRequires:  python-devel
 %if %{with python}
 BuildRequires:  python-devel
 BuildRequires:  swig
@@ -94,6 +93,9 @@ Source16:       unbound-munin.README
 Source17:       unbound.firewall
 
 Summary:        Validating, recursive, and caching DNS(SEC) resolver
+License:        BSD-3-Clause
+Group:          Productivity/Networking/DNS/Servers
+
 %description
 Unbound is a validating, recursive, and caching DNS(SEC) resolver.
 
@@ -107,10 +109,11 @@ as a server, but are linked into an application) are easily possible.
 
 %define libname libunbound2
 %package -n %{libname}
-Group:          Development/Libraries/C and C++
 Requires:       %{name}-anchor >= %{version}
 #
 Summary:        Shared library from unbound
+Group:          Development/Libraries/C and C++
+
 %description -n %{libname}
 Unbound is a validating, recursive, and caching DNS(SEC) resolver.
 
@@ -120,10 +123,11 @@ This package holds the shared library from unbound.
 %package munin
 Summary:        Plugin for the munin / munin-node monitoring package
 Group:          System Environment/Daemons
-Requires:       munin-node
 Requires:       %{name} = %{version}
 Requires:       bc
+Requires:       munin-node
 BuildArch:      noarch
+
 %description munin
 Unbound is a validating, recursive, and caching DNS(SEC) resolver.
 
@@ -131,22 +135,24 @@ This package holds the plugin for the munin / munin-node monitoring package
 %endif
 
 %package devel
-Group:          Development/Libraries/C and C++
 Requires:       %{libname} = %{version}
 Requires:       ldns-devel >= %{ldns_version}
 Requires:       openssl-devel
 #
 Summary:        Development files for libunbound
+Group:          Development/Libraries/C and C++
+
 %description devel
 Unbound is a validating, recursive, and caching DNS(SEC) resolver.
 
 This package holds the development files to work with libunbound.
 
 %package anchor
-Group:          Productivity/Networking/DNS/Servers
 #
 Requires:       cron
 Summary:        Unbound Anchor cert management tools
+Group:          Productivity/Networking/DNS/Servers
+
 %description anchor
 Unbound is a validating, recursive, and caching DNS(SEC) resolver.
 
@@ -157,6 +163,7 @@ This package contains the tools to manage the anchor certs.
 Summary:        Python modules and extensions for unbound
 Group:          Applications/System
 Requires:       %{libname} = %{version}
+
 %description python
 Unbound is a validating, recursive, and caching DNS(SEC) resolver.
 
@@ -265,8 +272,8 @@ echo ".so man8/unbound-control.8" > %{buildroot}/%{_mandir}/man8/unbound-control
 %{__rm} -rf %{buildroot}
 
 %pre anchor
-/usr/sbin/groupadd -r unbound &>/dev/null || :
-/usr/sbin/useradd  -g unbound -s /bin/false -r -c "unbound caching dns server" -d /var/lib/unbound unbound &>/dev/null || :
+/usr/sbin/groupadd -r unbound >/dev/null 2>&1 || :
+/usr/sbin/useradd -g unbound -s /bin/false -r -c "unbound caching dns server" -d /var/lib/unbound unbound >/dev/null 2>&1 || :
 
 %pre
 %if %{with systemd}