From ebff061d2d8c0985c044f7d22e228c1a7c7586201e1c331fac793a3a37524db2 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Fri, 31 Mar 2017 13:23:59 +0000
Subject: [PATCH] Accepting request 483810 from
 home:favogt:branches:Base:System

- Make it possible to disable tests (for Ring0)
- Add BuildRequires: system-user-daemon for the testsuite

OBS-URL: https://build.opensuse.org/request/show/483810
OBS-URL: https://build.opensuse.org/package/show/Base:System/acl?expand=0&rev=48
---
 acl.changes |  6 ++++++
 acl.spec    | 20 +++++++++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/acl.changes b/acl.changes
index 2528fef..ed5c26c 100644
--- a/acl.changes
+++ b/acl.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar 29 14:25:36 UTC 2017 - fvogt@suse.com
+
+- Make it possible to disable tests (for Ring0)
+- Add BuildRequires: system-user-daemon for the testsuite
+
 -------------------------------------------------------------------
 Mon Mar 13 11:06:09 CET 2017 - kukuk@suse.de
 
diff --git a/acl.spec b/acl.spec
index f0357de..cbd0122 100644
--- a/acl.spec
+++ b/acl.spec
@@ -16,6 +16,9 @@
 #
 
 
+# Ring0 does not have system-user-bin/system-user-daemon
+%bcond_without acl_tests
+
 Name:           acl
 %define lname	libacl1
 Summary:        Commands for Manipulating POSIX Access Control Lists
@@ -78,8 +81,9 @@ BuildRequires:  gettext-tools
 BuildRequires:  libattr-devel
 BuildRequires:  libtool
 BuildRequires:  pkg-config
-%if 0%{?suse_version} > 1320
+%if %{with acl_tests} && 0%{?suse_version} > 1320
 BuildRequires:  system-user-bin
+BuildRequires:  system-user-daemon
 %endif
 #BuildRequires:  gpg-offline
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -178,12 +182,14 @@ CFLAGS="$RPM_OPT_FLAGS"
 %{__make} %{?_smp_mflags}
 
 %check
-if ./setfacl -m u:`id -u`:rwx .; then
-    make check || (cat test-suite.log ; false)
-else
-    echo '*** ACLs are probably not supported by the file system,' \
-         'the test-suite will NOT run ***'
-fi
+%if %{with acl_tests}
+    if ./setfacl -m u:`id -u`:rwx .; then
+        make check || (cat test-suite.log ; false)
+    else
+        echo '*** ACLs are probably not supported by the file system,' \
+             'the test-suite will NOT run ***'
+    fi
+%endif
 
 %install
 %make_install