diff --git a/sources b/sources index 8cec65c..79ed972 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-live-3.0.12.tar.gz) = 21c32645caefb3177c9a984de98febcbea6926c744ad2c8cfe3053da6cbd644868ca783c4c9d587c0fd66a26f6051443cb3d22bc7637bebddf70fd8b1559d637 +SHA512 (vdr-live-3.1.8.tar.gz) = 1f89e1b782ea258726e3cf6cf236a029937ba5df10ce04b6142084afd0912d5513efe601e9a82bd69a5fd5355d23036b90d0399bac616aed666ac00c062d5c9d diff --git a/vdr-live.spec b/vdr-live.spec index 333cef1..08bd2a9 100644 --- a/vdr-live.spec +++ b/vdr-live.spec @@ -1,11 +1,19 @@ -# https://github.com/MarkusEh/vdr-plugin-live/commit/075080afb4f2a9ec1d3a488ba62095867479aee2 -%global commit0 075080afb4f2a9ec1d3a488ba62095867479aee2 +# https://github.com/MarkusEh/vdr-plugin-live/commit/0fbd9b32fc6afcdbe8722daa0e772260cd058f41 +%global commit0 0fbd9b32fc6afcdbe8722daa0e772260cd058f41 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global gitdate 20210307 +%global gitdate 20211228 +# version we want build against +%global vdr_version 2.4.0 +%if 0%{?fedora} >= 36 +%global vdr_version 2.6.1 +%endif +%if 0%{?fedora} == 35 +%global vdr_version 2.4.7 +%endif Name: vdr-live -Version: 3.0.12 -#Release: 0.2.%%{gitdate}git%%{shortcommit0}%%{?dist} +Version: 3.1.8 +#Release: 0.4.%%{gitdate}git%%{shortcommit0}%%{?dist} Release: 1%{?dist} Summary: An interactive web interface with HTML5 live stream support for VDR @@ -18,8 +26,8 @@ Source1: %{name}.conf BuildRequires: make BuildRequires: gcc-c++ -BuildRequires: vdr-devel >= 2.2.0 -BuildRequires: pcre-devel +BuildRequires: vdr-devel >= %{vdr_version} +BuildRequires: pcre2-devel BuildRequires: tntnet-devel BuildRequires: cxxtools-devel Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} @@ -56,7 +64,11 @@ rm -rf httpd iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build +%if 0%{?fedora} > 35 %make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" +%else +%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -std=gnu++14 -fPIC" +%endif %install %make_install @@ -77,6 +89,53 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/live/ %changelog +* Mon Oct 10 2022 Martin Gansser - 3.1.8-1 +- Updatae to 3.1.8 + +* Thu Jul 28 2022 Martin Gansser - 3.1.7-1 +- Updatae to 3.1.7 + +* Sat Jul 23 2022 Fedora Release Engineering - 3.1.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 20 2022 Martin Gansser - 3.1.6-2 +- Built against correct vdr-devel version + +* Sun Jun 19 2022 Martin Gansser - 3.1.6-1 +- Updatae to 3.1.6 + +* Sat Feb 12 2022 Martin Gansser - 3.1.5-2 +- Rebuilt + +* Thu Feb 03 2022 Martin Gansser - 3.1.5-1 +- Update to 3.1.5 + +* Sat Jan 29 2022 Martin Gansser - 3.1.4-0.4.20211228git0fbd9b3 +- Add %%undefine _package_note_flags to vdr main package +- rebuild for rawhide + +* Sat Jan 22 2022 Fedora Release Engineering - 3.1.4-0.3.20211228git0fbd9b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Dec 30 2021 Martin Gansser - 3.1.4-0.2.20211228git0fbd9b3 +- Build compatibility to g++11 + +* Tue Dec 28 2021 Martin Gansser - 3.1.4-0.1.20211228git0fbd9b3 +- Replace obsolete pcre by pcre2 +- Update to 3.1.4-0.1.20211228git0fbd9b3 + +* Mon Nov 15 2021 Martin Gansser - 3.1.3-1 +- Update to 3.1.3 + +* Fri Nov 5 2021 Dirk Nehring - 3.1.1-2 +- Build compatibility to g++11 + +* Mon Nov 01 2021 Martin Gansser - 3.1.1-1 +- Update to 3.1.1 + +* Thu Oct 28 2021 Martin Gansser - 3.1.0-1 +- Update to 3.1.0 + * Fri Oct 15 2021 Martin Gansser - 3.0.12-1 - Update to 3.0.12