SHA256
1
0
forked from pool/tvheadend

Accepting request 486994 from home:alois:branches:multimedia:apps

Update to 4.0.10 (2nd attempt)

OBS-URL: https://build.opensuse.org/request/show/486994
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/tvheadend?expand=0&rev=12
This commit is contained in:
Tomas Cech 2017-04-10 08:54:24 +00:00 committed by Git OBS Bridge
parent 94c35bf5f7
commit 2d24903784
5 changed files with 13 additions and 28 deletions

3
tvheadend-4.0.10.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f610e7d9f3bf6cff05cd73830a66ee0c74bc5291c4c9d08369364c4c681ebf23
size 15825140

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cea1106f45e286e8c25e6b2f0a581c28bd85e93ce3801ecaac7041568a214977
size 15825419

View File

@ -1,21 +0,0 @@
diff -Naur a/src/htsmsg.c b/src/htsmsg.c
--- a/src/htsmsg.c 2016-03-14 04:10:57.000000000 -0500
+++ b/src/htsmsg.c 2016-09-26 16:51:51.367645274 -0500
@@ -760,13 +760,15 @@
case HMF_MAP:
printf("MAP) = {\n");
htsmsg_print0(&f->hmf_msg, indent + 1);
- for(i = 0; i < indent; i++) printf("\t"); printf("}\n");
+ for(i = 0; i < indent; i++) printf("\t");
+ printf("}\n");
break;
case HMF_LIST:
printf("LIST) = {\n");
htsmsg_print0(&f->hmf_msg, indent + 1);
- for(i = 0; i < indent; i++) printf("\t"); printf("}\n");
+ for(i = 0; i < indent; i++) printf("\t");
+ printf("}\n");
break;
case HMF_STR:

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Apr 10 08:20:53 UTC 2017 - aloisio@gmx.com
- Update to version 4.0.10. For a changelog see
https://github.com/tvheadend/tvheadend/compare/v4.0.9...v4.0.10
- Dropped tvheadend-fix-misleading-indent.patch (merged upstream)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 16 08:43:19 UTC 2017 - sleep_walker@opensuse.org Thu Mar 16 08:43:19 UTC 2017 - sleep_walker@opensuse.org

View File

@ -21,7 +21,7 @@
%define htsuser hts %define htsuser hts
%define homedir %{_localstatedir}/lib/tvheadend %define homedir %{_localstatedir}/lib/tvheadend
Name: tvheadend Name: tvheadend
Version: 4.0.9 Version: 4.0.10
Release: 0 Release: 0
Summary: A TV Streaming Server Summary: A TV Streaming Server
# parsers are from FFMpeg project under LGPL-2.1 # parsers are from FFMpeg project under LGPL-2.1
@ -35,8 +35,6 @@ Source2: %{name}-rpmlintrc
Source3: %{name}_super Source3: %{name}_super
# PATCH-FIX-OPENSUSE tvheadend-4.0_no-werror.patch -- Do not treat warnings as errors. # PATCH-FIX-OPENSUSE tvheadend-4.0_no-werror.patch -- Do not treat warnings as errors.
Patch0: %{name}-4.0_no-werror.patch 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 # PATCH-FIX-OPENSUSE tvheadend-fix-service-dependency.patch -- do not wait for or require syslog
Patch2: %{name}-fix-service-dependency.patch Patch2: %{name}-fix-service-dependency.patch
# FFMPEG related patches # FFMPEG related patches
@ -54,7 +52,9 @@ BuildRequires: pkgconfig(libssl)
BuildRequires: pkgconfig(libswscale) BuildRequires: pkgconfig(libswscale)
BuildRequires: pkgconfig(liburiparser) BuildRequires: pkgconfig(liburiparser)
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
%if 0%{?suse_version} > 1320
Requires(pre): group(%{htsgroup}) Requires(pre): group(%{htsgroup})
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_requires} %{?systemd_requires}
@ -69,7 +69,6 @@ scheduling recordings.
%prep %prep
%setup -q %setup -q
%patch0 %patch0
%patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1