From b862219a34ad0a168fde526c70b90a78e1c9f9432d40320aff509b38ade83a01 Mon Sep 17 00:00:00 2001 From: Tomas Cech Date: Tue, 28 Feb 2017 10:33:29 +0000 Subject: [PATCH] Accepting request 460818 from home:sleep_walker:branches:multimedia:apps - rename tvheadend-fix-daemon-user-group.patch to tvheadend-fix-service-dependency.patch and use it again - don't wait for syslog (user/group part is done by sed) OBS-URL: https://build.opensuse.org/request/show/460818 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/tvheadend?expand=0&rev=7 --- ...-group.patch => tvheadend-fix-service-dependency.patch | 0 tvheadend.changes | 8 ++++++++ tvheadend.spec | 5 +++-- 3 files changed, 11 insertions(+), 2 deletions(-) rename tvheadend-fix-daemon-user-group.patch => tvheadend-fix-service-dependency.patch (100%) diff --git a/tvheadend-fix-daemon-user-group.patch b/tvheadend-fix-service-dependency.patch similarity index 100% rename from tvheadend-fix-daemon-user-group.patch rename to tvheadend-fix-service-dependency.patch diff --git a/tvheadend.changes b/tvheadend.changes index fca0cb9..680e63c 100644 --- a/tvheadend.changes +++ b/tvheadend.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Feb 28 08:35:31 UTC 2017 - sleep_walker@opensuse.org + +- rename tvheadend-fix-daemon-user-group.patch to + tvheadend-fix-service-dependency.patch and use it again - don't + wait for syslog (user/group part is done by sed) + + ------------------------------------------------------------------- Mon Feb 27 18:13:44 UTC 2017 - sleep_walker@opensuse.org diff --git a/tvheadend.spec b/tvheadend.spec index 41d4963..cc5164c 100644 --- a/tvheadend.spec +++ b/tvheadend.spec @@ -37,6 +37,8 @@ Source3: %{name}_super Patch0: %{name}-4.0_no-werror.patch # PATCH-FIX-OPENSUSE tvheadend-fix-misleading-indent.patch malcolmlewis@opensuse.org -- Fix warning/error produced with gcc-6. Patch1: %{name}-fix-misleading-indent.patch +# PATCH-FIX-OPENSUSE tvheadend-fix-service-dependency.patch -- do not wait for or require syslog +Patch2: %{name}-fix-service-dependency.patch BuildRequires: fdupes BuildRequires: pkgconfig BuildRequires: python-devel @@ -64,9 +66,8 @@ scheduling recordings. %prep %setup -q %patch0 -%if 0%{?suse_version} >= 1320 %patch1 -p1 -%endif +%patch2 -p1 sed -e "s/-u \([^ ]*\) -g \([^ ]*\)/-u %{htsuser} -g %{htsgroup}/" -i rpm/%{name}.sysconfig sed -e '/^TVH_ARGS/cTVH_ARGS="-C"' -i debian/%{name}.default