From c9e3f60abb2fdc6d9438c7cf772f37a661bbe699bdfa1eb58f2e92e061a4f5af Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Mon, 27 Nov 2017 14:04:41 +0000
Subject: [PATCH] Accepting request 545974 from home:jengelh:branches:network

- Do not suppress errors from useradd.
- Ensure neutrality of description.

OBS-URL: https://build.opensuse.org/request/show/545974
OBS-URL: https://build.opensuse.org/package/show/network/keepalived?expand=0&rev=36
---
 keepalived.changes |  6 ++++++
 keepalived.spec    | 23 ++++++++++++-----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/keepalived.changes b/keepalived.changes
index 27ca5bb..1358f7d 100644
--- a/keepalived.changes
+++ b/keepalived.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Nov 27 11:26:58 UTC 2017 - jengelh@inai.de
+
+- Do not suppress errors from useradd.
+- Ensure neutrality of description.
+
 -------------------------------------------------------------------
 Thu Nov 27 09:11:55 UTC 2017 - igarcia@suse.com
 
diff --git a/keepalived.spec b/keepalived.spec
index fe52541..e41f5e7 100644
--- a/keepalived.spec
+++ b/keepalived.spec
@@ -31,7 +31,7 @@
 Name:           keepalived
 Version:        1.3.9
 Release:        0
-Summary:        A strong & robust keepalive facility for linux
+Summary:        A keepalive facility for Linux
 License:        GPL-2.0+
 Group:          Productivity/Networking/Routing
 Url:            http://www.keepalived.org/
@@ -76,15 +76,14 @@ Requires:       systemd
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-The main goal of this project is to provide simple and robust facilities for
-loadbalancing and high-availability to Linux system and Linux based
-infrastructures. Loadbalancing framework relies on well-known and widely used
-Linux Virtual Server (IPVS) kernel module providing Layer4 loadbalancing.
+This project provides facilities for load balancing and high-availability to Linux system and Linux-based
+infrastructures. The load-balancing framework relies on the
+Linux Virtual Server (IPVS) kernel module providing Layer4 load balancing.
 Keepalived implements a set of checkers to dynamically and adaptively maintain
-and manage loadbalanced server pool according their health. On the other hand
-high-availability is achieved by VRRP protocol. VRRP is a fundamental brick for
+and manage loadbalanced server pool according their health.
+High-availability is achieved by the VRRP protocol, a fundamental brick for
 router failover. In addition, Keepalived implements a set of hooks to the VRRP
-finite state machine providing low-level and high-speed protocol interactions.
+finite state machine, providing low-level and high-speed protocol interactions.
 Keepalived frameworks can be used independently or all together to provide
 resilient infrastructures.
 
@@ -115,7 +114,7 @@ export CFLAGS="%optflags -DOPENSSL_NO_SSL_INTERN"
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR="%{buildroot}"
+%make_install
 install -dD -m 0750 %{buildroot}%{_var}/lib/%{name}
 install -D  -m 0644 %{buildroot}/etc/sysconfig/keepalived %{buildroot}%{_fillupdir}/sysconfig.%{name}
 
@@ -131,8 +130,10 @@ chmod -R o= %{buildroot}/etc/keepalived
 rm -rv %{buildroot}/etc/keepalived/samples/ %{buildroot}/etc/sysconfig/keepalived
 
 %pre
-/usr/sbin/groupadd -r %{name} >/dev/null 2>&1 || :
-/usr/sbin/useradd -g %{name} -s /bin/false -r -c "Keepalived" -d %{_var}/lib/%{name} %{name} >/dev/null 2>&1 || :
+getent group %{name} >/dev/null || /usr/sbin/groupadd -r %{name}
+getent passwd %{name} >/dev/null || \
+	/usr/sbin/useradd -g %{name} -s /bin/false -r -c "Keepalived" \
+	-d %{_var}/lib/%{name} %{name}
 %if %{with systemd}
 %service_add_pre %{name}.service %{name}.socket
 %endif