From 19780bd8114ff40380686103b91715b8623bc2ad Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 11 Jan 2021 13:04:09 +0100 Subject: [PATCH 1/5] Use fork because its under maintenance Update to 2.3.1-18.20201122git3b24485 --- vdr-live.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/vdr-live.spec b/vdr-live.spec index a65af95..99b8160 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -1,12 +1,12 @@ # https://github.com/kfb77/vdr-plugin-live/commit/3b2448599112b33ede5d58d689179dd708d073f5 -%global commit0 3b2448599112b33ede5d58d689179dd708d073f5 +%global commit0 3b2448599112b33ede5d58d689179dd708d073f5 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global gitdate 20201122 Name: vdr-live Version: 2.3.1 Release: 18.%{gitdate}git%{shortcommit0}%{?dist} -Summary: An interactive web interface for VDR +Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPLv2+ except live/js/mootools/ which is MIT License: GPLv2+ and MIT @@ -26,11 +26,12 @@ Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} Requires: %{name}-data = %{version}-%{release} %description +New version with HTML5 live stream support Live, the "Live Interactive VDR Environment", is a plugin providing the -possibility to interactively control the VDR and some of its plugins by +possibility to interactively control the VDR and some of it's plugins by a web interface. -Unlike external utility programs that communicate with VDR and its plugins +Unlike external utility programs that communicate with VDR and it's plugins by SVDRP, Live has direct access to VDR's data structures and is thus very fast. From 60361d7501354e1bfdd0e63daea429a8d08dd3f5 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 1 Mar 2021 20:03:21 +0100 Subject: [PATCH 2/5] Rebuilt for cxxtools/tntnet-3.0 support Update to 3.0.5 --- sources | 2 +- vdr-live.spec | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/sources b/sources index 834da19..15d8904 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.0.4.tar.gz) = 5fcf6cb756c1fde7e1cd7c0a3233bceab687ef7629b8867db0d990af7bf5676151158b77822cf7389a64134f8038da4b3577f014ff675668eb4de7d27380f684 +SHA512 (vdr-live-3.0.5.tar.gz) = 7acfe266d9b3e0a9c3f74ac45c561b70e6eabb0f63b9e8b6dee5ce85fe5803d6d63910d9f1ada1893b7820d37cd5f3e1312cb4764823570a85f999dc88dc5d0d diff --git a/vdr-live.spec b/vdr-live.spec index dc0503b..2dc3248 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -1,17 +1,18 @@ -# https://github.com/MarkusEh/vdr-plugin-live/commit/c360c989a9d4b794836164ec40d2fb185ceddc0f -%global commit0 f6cfefad67e68bf9753303c31a507886d8231083 +# https://github.com/MarkusEh/vdr-plugin-live/commit/5c9f734b5bf7664b59bb3a2a2d555fb42ac3ed17 +%global commit0 5c9f734b5bf7664b59bb3a2a2d555fb42ac3ed17 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global gitdate 20210111 +%global gitdate 20210301 Name: vdr-live -Version: 3.0.4 -#Release: 1.%%{gitdate}git%%{shortcommit0}%%{?dist} +Version: 3.0.5 +# Release: 2.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPLv2+ except live/js/mootools/ which is MIT License: GPLv2+ and MIT URL: https://github.com/MarkusEh/vdr-plugin-live +# Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/%%{commit0}/%%{name}-%%{version}-%%{shortcommit0}.tar.gz Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}.conf @@ -43,6 +44,7 @@ Requires: %{name} = %{version}-%{release} This package contains images, themes and JavaScript. %prep +#%%autosetup -p1 -n vdr-plugin-live-%%{commit0} %autosetup -p1 -n vdr-plugin-live-%{version} # delete unused directories and files @@ -54,10 +56,10 @@ rm -rf httpd iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build -make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" all +%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" all %install -make install DESTDIR=%{buildroot} +%make_install DESTDIR=%{buildroot} # live.conf install -Dpm 644 %{SOURCE1} \ @@ -80,6 +82,10 @@ cp -pR live/* %{buildroot}%{vdr_resdir}/plugins/live %changelog +* Mon Mar 01 2021 Martin Gansser - 3.0.5-1 +- Rebuilt for cxxtools/tntnet-3.0 support +- Update to 3.0.5 + * Sun Jan 31 2021 Martin Gansser - 3.0.4-1 - Update to 3.0.4 From 5bddafd71b5b40ebacd8166f6dcb67b398b6cd38 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 3 Mar 2021 12:00:30 +0100 Subject: [PATCH 3/5] Update to 3.0.6 --- sources | 2 +- vdr-live.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 15d8904..2b2ea03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.0.5.tar.gz) = 7acfe266d9b3e0a9c3f74ac45c561b70e6eabb0f63b9e8b6dee5ce85fe5803d6d63910d9f1ada1893b7820d37cd5f3e1312cb4764823570a85f999dc88dc5d0d +SHA512 (vdr-live-3.0.6.tar.gz) = f60cd14c3a02eeb571ffc181dabd83dd0af0595d378ed34bc9cee1d54b560d74027c758d3b4d69541a71dc6f94b5f64e3972fc51aeb5a9d688be7656636bcf98 diff --git a/vdr-live.spec b/vdr-live.spec index 2dc3248..8c2cc62 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -4,7 +4,7 @@ %global gitdate 20210301 Name: vdr-live -Version: 3.0.5 +Version: 3.0.6 # Release: 2.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -56,7 +56,7 @@ rm -rf httpd iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build -%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" all +%make_build CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" %install %make_install DESTDIR=%{buildroot} @@ -82,6 +82,9 @@ cp -pR live/* %{buildroot}%{vdr_resdir}/plugins/live %changelog +* Wed Mar 03 2021 Martin Gansser - 3.0.6-1 +- Update to 3.0.6 + * Mon Mar 01 2021 Martin Gansser - 3.0.5-1 - Rebuilt for cxxtools/tntnet-3.0 support - Update to 3.0.5 From bc08974b458516c606dfb46c8fd8d34e65447b6f Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 3 Mar 2021 12:09:21 +0100 Subject: [PATCH 4/5] Update to 3.0.6 --- vdr-live.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vdr-live.spec b/vdr-live.spec index 8c2cc62..a484605 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -56,7 +56,7 @@ rm -rf httpd iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build -%make_build CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" +%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %install %make_install DESTDIR=%{buildroot} From 88148ae750295011f412b8f73ecf4596ea97e5f7 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 7 Mar 2021 09:36:39 +0100 Subject: [PATCH 5/5] Update to 3.0.7-0.1.20210307git075080a --- sources | 2 +- vdr-live.spec | 28 +++++++++++++--------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/sources b/sources index 2b2ea03..82dc60c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.0.6.tar.gz) = f60cd14c3a02eeb571ffc181dabd83dd0af0595d378ed34bc9cee1d54b560d74027c758d3b4d69541a71dc6f94b5f64e3972fc51aeb5a9d688be7656636bcf98 +SHA512 (vdr-live-3.0.7-075080a.tar.gz) = f4e75976bec8ffda471954639d32aebe4049f23877c5d8a8cac1f1385b6981bec74cf3e57dfe38414309c5ffd74c90b511ee1ed05f9d452183641c656ba78e11 diff --git a/vdr-live.spec b/vdr-live.spec index a484605..a2190df 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -1,19 +1,19 @@ -# https://github.com/MarkusEh/vdr-plugin-live/commit/5c9f734b5bf7664b59bb3a2a2d555fb42ac3ed17 -%global commit0 5c9f734b5bf7664b59bb3a2a2d555fb42ac3ed17 +# https://github.com/MarkusEh/vdr-plugin-live/commit/075080afb4f2a9ec1d3a488ba62095867479aee2 +%global commit0 075080afb4f2a9ec1d3a488ba62095867479aee2 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global gitdate 20210301 +%global gitdate 20210307 Name: vdr-live -Version: 3.0.6 -# Release: 2.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 1%{?dist} +Version: 3.0.7 +Release: 0.1.%{gitdate}git%{shortcommit0}%{?dist} +#Release: 1%%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR # The entire source code is GPLv2+ except live/js/mootools/ which is MIT License: GPLv2+ and MIT URL: https://github.com/MarkusEh/vdr-plugin-live -# Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/%%{commit0}/%%{name}-%%{version}-%%{shortcommit0}.tar.gz -Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz +#Source0: https://github.com/MarkusEh/vdr-plugin-live/archive/v%%{version}.tar.gz#/%%{name}-%%{version}.tar.gz Source1: %{name}.conf BuildRequires: make @@ -44,8 +44,8 @@ Requires: %{name} = %{version}-%{release} This package contains images, themes and JavaScript. %prep -#%%autosetup -p1 -n vdr-plugin-live-%%{commit0} -%autosetup -p1 -n vdr-plugin-live-%{version} +%autosetup -p1 -n vdr-plugin-live-%{commit0} +#%%autosetup -p1 -n vdr-plugin-live-%%{version} # delete unused directories and files find -name .git -type d -or -name gitignore -type d | xargs rm -rfv @@ -67,10 +67,6 @@ install -Dpm 644 %{SOURCE1} \ %find_lang %{name} -install -dm 755 %{buildroot}%{vdr_resdir}/plugins/live -cp -pR live/* %{buildroot}%{vdr_resdir}/plugins/live - - %files -f %{name}.lang %doc CONTRIBUTORS README %license COPYING @@ -80,8 +76,10 @@ cp -pR live/* %{buildroot}%{vdr_resdir}/plugins/live %files data %{vdr_resdir}/plugins/live/ - %changelog +* Sun Mar 07 2021 Martin Gansser - 3.0.7-0.1.20210307git075080a +- Update to 3.0.7-0.1.20210307git075080a + * Wed Mar 03 2021 Martin Gansser - 3.0.6-1 - Update to 3.0.6