diff --git a/sources b/sources index 834da19..82dc60c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.0.4.tar.gz) = 5fcf6cb756c1fde7e1cd7c0a3233bceab687ef7629b8867db0d990af7bf5676151158b77822cf7389a64134f8038da4b3577f014ff675668eb4de7d27380f684 +SHA512 (vdr-live-3.0.7-075080a.tar.gz) = f4e75976bec8ffda471954639d32aebe4049f23877c5d8a8cac1f1385b6981bec74cf3e57dfe38414309c5ffd74c90b511ee1ed05f9d452183641c656ba78e11 diff --git a/vdr-live.spec b/vdr-live.spec index dc0503b..a2190df 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -1,18 +1,19 @@ -# https://github.com/MarkusEh/vdr-plugin-live/commit/c360c989a9d4b794836164ec40d2fb185ceddc0f -%global commit0 f6cfefad67e68bf9753303c31a507886d8231083 +# https://github.com/MarkusEh/vdr-plugin-live/commit/075080afb4f2a9ec1d3a488ba62095867479aee2 +%global commit0 075080afb4f2a9ec1d3a488ba62095867479aee2 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global gitdate 20210111 +%global gitdate 20210307 Name: vdr-live -Version: 3.0.4 -#Release: 1.%%{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/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 @@ -43,7 +44,8 @@ Requires: %{name} = %{version}-%{release} This package contains images, themes and JavaScript. %prep -%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 @@ -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" %install -make install DESTDIR=%{buildroot} +%make_install DESTDIR=%{buildroot} # live.conf install -Dpm 644 %{SOURCE1} \ @@ -65,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 @@ -78,8 +76,17 @@ 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 + +* 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