From cb2f021ef191c96ccb0d10f8aa4902f2c0ff0f5dd42cabc9168453022b77275d Mon Sep 17 00:00:00 2001
From: Tomas Cech <sleep_walker@opensuse.org>
Date: Wed, 17 May 2017 05:51:10 +0000
Subject: [PATCH] Accepting request 495496 from
 home:alois:branches:multimedia:apps

OBS-URL: https://build.opensuse.org/request/show/495496
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/tvheadend?expand=0&rev=16
---
 tvheadend.changes | 5 +++++
 tvheadend.spec    | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tvheadend.changes b/tvheadend.changes
index a0fa8d4..2d57acd 100644
--- a/tvheadend.changes
+++ b/tvheadend.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May 16 21:28:58 UTC 2017 - aloisio@gmx.com
+
+- Fixed %pre
+
 -------------------------------------------------------------------
 Tue May 16 10:43:34 UTC 2017 - aloisio@gmx.com
 
diff --git a/tvheadend.spec b/tvheadend.spec
index 65c220b..ef7e81a 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -111,8 +111,7 @@ EOM
 
 %pre
 %service_add_pre %{name}.service
-%{_sbindir}/useradd -u 1337 -g %{htsgroup} -m -d %{homedir} -r -s /bin/false %{htsuser} -c "Tvheadend TV server" &> /dev/null || :
-%{_sbindir}/passwd -l %{htsuser} &> /dev/null || :
+getent passwd %htsuser >/dev/null || %{_sbindir}/useradd -g %{htsgroup} -m -d %{homedir} -r -s /bin/false %{htsuser} -c "Tvheadend TV server"
 
 %preun
 %service_del_preun %{name}.service