1:23 p.m.
commit 27f1ea010a5e116daba394ef1646aa3d46c5a61b
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Tue Oct 9 13:53:11 2018 +0200
Update to 4.2.7
.gitignore | 1 +
sources | 2 +-
tvheadend-4.2.5-ffmpeg_3.5.patch | 115 ---------------------
tvheadend-4.2.5-gcc8.patch | 110 --------------------
...-service.patch => tvheadend-4.2.7-service.patch | 6 +-
tvheadend.spec | 19 ++--
6 files changed, 14 insertions(+), 239 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6161bce..d5ca0df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/tvheadend-4.2.4.tar.gz
/tvheadend-4.2.5.tar.gz
/tvheadend-4.2.6.tar.gz
+/tvheadend-4.2.7.tar.gz
diff --git a/sources b/sources
index 5292193..6e6e9ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ed593fa2e4bab6130aaf20f5017d23fb tvheadend-4.2.6.tar.gz
+db025d4672253019c59cd4f60beccd06 tvheadend-4.2.7.tar.gz
diff --git a/tvheadend-4.2.1-service.patch b/tvheadend-4.2.7-service.patch
similarity index 53%
rename from tvheadend-4.2.1-service.patch
rename to tvheadend-4.2.7-service.patch
index e881a87..c5b9669 100644
--- a/tvheadend-4.2.1-service.patch
+++ b/tvheadend-4.2.7-service.patch
@@ -1,9 +1,9 @@
diff -up ./rpm/tvheadend.sysconfig.orig ./rpm/tvheadend.sysconfig
---- ./rpm/tvheadend.sysconfig.orig 2017-04-21 10:32:22.000000000 +0200
-+++ ./rpm/tvheadend.sysconfig 2017-04-23 13:24:58.581096686 +0200
+--- ./rpm/tvheadend.sysconfig.orig 2018-10-08 14:37:05.000000000 +0200
++++ ./rpm/tvheadend.sysconfig 2018-10-09 12:21:53.932489202 +0200
@@ -1,4 +1,4 @@
# Configuration file for the tvheadend service.
MALLOC_ARENA_MAX=4
--OPTIONS="-c /home/tvheadend/config -u tvheadend -g tvheadend -6 --http_port 9981
--htsp_port 9982"
+-OPTIONS="-c /var/lib/tvheadend/config -u tvheadend -g tvheadend -6 --http_port 9981
--htsp_port 9982"
+OPTIONS="-c /var/lib/tvheadend/config -u tvheadend -g video -6 -C --http_port 9981
--htsp_port 9982"
diff --git a/tvheadend.spec b/tvheadend.spec
index d922c0e..a3d87ea 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -2,21 +2,19 @@
%global tvheadend_group video
Name: tvheadend
-Version: 4.2.6
+Version: 4.2.7
Release: 1%{?dist}
Summary: TV streaming server and digital video recorder
-Group: Applications/Multimedia
License: GPLv3+
URL: https://tvheadend.org/
Source0:
https://github.com/tvheadend/%{name}/archive/v%{version}/%{name}-%{versio...
# Fix build with hdhomerun
Patch0: %{name}-4.2.1-hdhomerun.patch
# Fix systemd service and configuration:
-# - Fix daemon user path
# - Fix daemon group (use video to access DVB devices)
# - Add -C option to allow UI access without login at first run
-Patch1: %{name}-4.2.1-service.patch
+Patch1: %{name}-4.2.7-service.patch
# Use system queue.h header
Patch2: %{name}-4.0.9-use_system_queue.patch
# Fix system DTV scan tables path
@@ -24,10 +22,6 @@ Patch3: %{name}-4.2.2-dtv_scan_tables.patch
# Enforcing system crypto policies, see
# https://fedoraproject.org/wiki/Packaging:CryptoPolicies
Patch4: %{name}-4.2.1-crypto_policies.patch
-# Fix build with FFmpeg 3.5
-Patch5: %{name}-4.2.5-ffmpeg_3.5.patch
-# Fix build with GCC >= 8
-Patch6: %{name}-4.2.5-gcc8.patch
BuildRequires: bzip2
BuildRequires: gcc
@@ -48,7 +42,7 @@ BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(liburiparser)
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(zlib)
-BuildRequires: python2
+BuildRequires: python3-devel
BuildRequires: systemd
Requires: bzip2
Requires: dtv-scan-tables
@@ -102,7 +96,7 @@ rm -r vendor/{dvb-api,include}/
--enable-dvbcsa \
--enable-hdhomerun_client \
--enable-libsystemd_daemon
-%make_build V=1 PYTHON=python2
+%make_build V=1 PYTHON=%{__python3}
%install
@@ -154,6 +148,11 @@ exit 0
%changelog
+* Tue Oct 09 2018 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.2.7-1
+- Update to 4.2.7
+- Remove patches merges upstream
+- Use Python 3 for build
+
* Tue Mar 27 2018 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.2.6-1
- Update to 4.2.6