From 1e9c40a256eefd37e003f452807e3e7a2334c8f2598889c842686ccdf7f39bd8 Mon Sep 17 00:00:00 2001
From: Andreas Vetter <vetter@physik.uni-wuerzburg.de>
Date: Tue, 25 Oct 2016 08:47:46 +0000
Subject: [PATCH] Accepting request 435652 from
 home:jengelh:branches:security:Stunnel

- Update rpm group and description and make -doc noarch
- Do not suppress errors from useradd
- Remove redundant %clean section

OBS-URL: https://build.opensuse.org/request/show/435652
OBS-URL: https://build.opensuse.org/package/show/security:Stunnel/stunnel?expand=0&rev=78
---
 stunnel.changes |  7 +++++++
 stunnel.spec    | 19 +++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/stunnel.changes b/stunnel.changes
index e5678b8..9ce668f 100644
--- a/stunnel.changes
+++ b/stunnel.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Oct 16 23:03:35 UTC 2016 - jengelh@inai.de
+
+- Update rpm group and description and make -doc noarch
+- Do not suppress errors from useradd
+- Remove redundant %clean section
+
 -------------------------------------------------------------------
 Fri Oct 14 08:03:59 UTC 2016 - drahn@suse.com
 
diff --git a/stunnel.spec b/stunnel.spec
index 9b14671..8ea77dc 100644
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -44,20 +44,22 @@ BuildRequires:  systemd
 %description
 The stunnel program is designed to work as an SSL encryption wrapper
 between remote clients and local (inetd-startable) or remote
-servers. The concept is that having non-SSL aware daemons running on
-your system you can easily set them to communicate with clients over a
+servers. The concept is that, while having non-SSL aware daemons running on
+your system, you can set them to communicate with clients over a
 secure SSL channels. Stunnel can be used to add SSL functionality to
-commonly used inetd daemons, such as POP-2, POP-3, and IMAP servers,
+commonly used inetd daemons, such as POP-2, POP-3, and IMAP servers
 without any changes to the program code.
 
 %package doc
 Summary:        Documentation for the universal SSL Tunnel
-Group:          Productivity/Networking/Security
+Group:          Documentation/Other
 Requires:       stunnel = %{version}
+%if 0%{?suse_version} >= 1210
+BuildArch:      noarch
+%endif
 
 %description doc
-This package contains additional documentation of the universal SSL tunnel
-stunnel.
+This package contains additional documentation for the stunnel program.
 
 %prep
 %setup -q -n stunnel-%{version}
@@ -98,13 +100,10 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/packages/stunnel/tools/stunnel.cnf
 rm -rf $RPM_BUILD_ROOT/usr/share/doc/stunnel
 mkdir -p $RPM_BUILD_ROOT/var/lib/stunnel/{bin,etc,dev,%_lib,sbin,var/run}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %pre
 if ! /usr/bin/getent passwd stunnel >/dev/null; then
    %{_sbindir}/useradd -r -c "Daemon user for stunnel (universal SSL tunnel)" -g nogroup -s /bin/false \
-   -d /var/lib/stunnel stunnel 2> /dev/null || :
+   -d /var/lib/stunnel stunnel || :
 fi
 
 %if 0%{?has_systemd}