From de73cbfe5266f3bee36f8d55073e57956e441bfd8d6b3bca4a71003ba482279c Mon Sep 17 00:00:00 2001
From: Oliver Kurz <okurz@suse.com>
Date: Thu, 11 May 2017 05:41:11 +0000
Subject: [PATCH] Accepting request 494011 from
 home:jengelh:branches:devel:openQA:tested

- Do not suppress errors from useradd
- Rectify RPM groups
- replace extra tar line with house tools

OBS-URL: https://build.opensuse.org/request/show/494011
OBS-URL: https://build.opensuse.org/package/show/devel:openQA:tested/openQA?expand=0&rev=11
---
 openQA.changes |  6 ++++++
 openQA.spec    | 26 +++++++++++---------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/openQA.changes b/openQA.changes
index f590c70..dcc4a25 100644
--- a/openQA.changes
+++ b/openQA.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 10 07:49:39 UTC 2017 - jengelh@inai.de
+
+- Do not suppress errors from useradd
+- Rectify RPM groups
+
 -------------------------------------------------------------------
 Thu Apr 06 09:17:10 UTC 2017 - rd-ops-cm@suse.de
 
diff --git a/openQA.spec b/openQA.spec
index f4b7dc4..d888d27 100644
--- a/openQA.spec
+++ b/openQA.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package openQA
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -80,15 +80,15 @@ BuildRequires:  %{t_requires}
 Requires:       dbus-1
 BuildRequires:  fdupes
 %if %{with tests}
+BuildRequires:  perl-App-cpanminus
 BuildRequires:  phantomjs
 BuildRequires:  perl(Mojo::RabbitMQ::Client)
-BuildRequires:  perl(Perl::Tidy)
 BuildRequires:  perl(Perl::Critic)
+BuildRequires:  perl(Perl::Tidy)
 BuildRequires:  perl(Selenium::Remote::Driver)
 BuildRequires:  perl(Test::Compile)
 BuildRequires:  perl(Test::MockObject)
 BuildRequires:  perl(Test::Warnings)
-BuildRequires:  perl-App-cpanminus
 %endif
 Requires(post): perl(DBIx::Class::DeploymentHandler)
 Requires(post): perl(SQL::SplitStatement)
@@ -156,15 +156,14 @@ a convenient helper for interacting with openQA webui REST API.
 
 %package doc
 Summary:        The openQA documentation
-Group:          Development/Tools/Other
+Group:          Documentation/Other
 
 %description doc
 Documentation material covering installation, configuration, basic test writing, etc.
-Covering both openQA and also os-autoinst test engine..
+Covering both openQA and also os-autoinst test engine.
 
 %prep
-%setup 
-tar xvf %{S:1}
+%setup -a1
 
 %build
 make
@@ -212,10 +211,9 @@ mkdir %{buildroot}%{_localstatedir}/lib/openqa/cache
 rm -f %{buildroot}/etc/dbus-1/system.d/org.opensuse.openqa.conf
 
 %pre
-if ! getent passwd geekotest > /dev/null; then
-  /usr/sbin/useradd -r -g nogroup -c "openQA user" \
-    -d /var/lib/openqa geekotest 2>/dev/null || :
-fi
+getent passwd geekotest >/dev/null || \
+	/usr/sbin/useradd -r -g nogroup -c "openQA user" \
+	-d /var/lib/openqa geekotest
 
 %service_add_pre %openqa_services
 
@@ -234,9 +232,9 @@ if [ "$1" = 1 ]; then
 fi
 
 %pre worker
-if ! getent passwd _openqa-worker > /dev/null; then
+if ! getent passwd _openqa-worker >/dev/null; then
   /usr/sbin/useradd -r -g nogroup -c "openQA worker" \
-    -d /var/lib/empty _openqa-worker 2>/dev/null || :
+    -d /var/lib/empty _openqa-worker
   # might fail for non-kvm workers (qemu package owns the group)
   /usr/sbin/usermod _openqa-worker -a -G kvm || :
 fi
@@ -402,6 +400,4 @@ fi
 %defattr(-,root,root)
 %doc docs/*
 
- 
-
 %changelog