diff --git a/.gitignore b/.gitignore index 12ae573..3f1a0d0 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,3 @@ /vdr-osd2web-0.2.50.tar.gz /vdr-osd2web-0.2.52.tar.gz /vdr-osd2web-0.2.54.tar.gz -/vdr-osd2web-0.2.56.tar.gz -/vdr-osd2web-0.2.58.tar.gz -/vdr-osd2web-0.3.0.tar.gz -/vdr-osd2web-0.3.1.tar.gz -/vdr-osd2web-0.3.2.tar.gz diff --git a/sources b/sources index 51348a5..6d1f9ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-osd2web-0.3.2.tar.gz) = de7bb75a36d9855011e082e4330bb043e4f9e5bcbfa3217219140978de7b81da76ff3e14dacd65a40c2f7097a85b964729fdb13c17a23691615ae59ee31c9caf +SHA512 (vdr-osd2web-0.2.54.tar.gz) = ab691df312737dc4c9754a5322ee4ff567399fa6649e1f5aa3910b81518fb6c2924fa42ce9094655612e7b72194e096d42814285afa14a6e09ac73385bf680f6 diff --git a/vdr-osd2web-ambiguous.patch b/vdr-osd2web-ambiguous.patch deleted file mode 100644 index 4a1990d..0000000 --- a/vdr-osd2web-ambiguous.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- vdr-plugin-osd2web-0.2.54/config.h.orig 2021-07-30 17:41:07.615798295 +0200 -+++ vdr-plugin-osd2web-0.2.54/config.h 2021-07-30 17:41:31.476800228 +0200 -@@ -13,6 +13,7 @@ - #ifndef __O2W_CONFIG_H - #define __O2W_CONFIG_H - -+#define DISABLE_TEMPLATES_COLLIDING_WITH_STL - #include "lib/config.h" - - //*************************************************************************** diff --git a/vdr-osd2web.spec b/vdr-osd2web.spec index 49af934..a6044b3 100644 --- a/vdr-osd2web.spec +++ b/vdr-osd2web.spec @@ -4,28 +4,18 @@ %global rname vdr-plugin-osd2web %global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$ -# Set vdr_version based on Fedora version -%if 0%{?fedora} >= 43 -%global vdr_version 2.7.7 -%elif 0%{?fedora} == 42 -%global vdr_version 2.7.4 -%else -%global vdr_version 2.6.9 -%endif - Name: vdr-%{pname} -Version: 0.3.2 -Release: 20%{?dist} +Version: 0.2.54 +Release: 2%{?dist} Summary: VDR skin interface for the browser -License: GPL-2.0-or-later +License: GPLv2+ URL: https://github.com/horchi/vdr-plugin-osd2web -Source0: https://github.com/horchi/vdr-plugin-osd2web/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: https://github.com/horchi/vdr-plugin-osd2web/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: vdr-osd2web-makefile.patch Source1: %{name}.conf -BuildRequires: make BuildRequires: gcc-c++ -BuildRequires: gettext -BuildRequires: vdr-devel >= %{vdr_version} +BuildRequires: vdr-devel >= 2.2.0 BuildRequires: libwebsockets-devel BuildRequires: zlib-devel BuildRequires: tinyxml2-devel @@ -81,128 +71,6 @@ install -Dpm 755 scripts/startBrowser.sh %{buildroot}%{vdr_plugindir}/bin/startB %{vdr_plugindir}/bin/startBrowser.sh %changelog -* Sun Nov 30 2025 Peter Robinson - 0.3.2-20 -- Rebuild against libwebsockets 4.5.0 - -* Sat Aug 23 2025 Benjamin A. Beasley - 0.3.2-19 -- Rebuilt for tinyxml2 11.0.0 - -* Fri Jul 25 2025 Martin Gansser - 0.3.2-18 -- Rebuilt for new VDR API version 2.7.7 - -* Fri Jul 25 2025 Fedora Release Engineering - 0.3.2-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon Jul 21 2025 Peter Robinson - 0.3.2-16 -- Rebuild for libwebsockets 4.4 - -* Sat Jun 21 2025 Martin Gansser - 0.3.2-15 -- Rebuilt for new VDR API version 2.7.6 - -* Tue May 27 2025 Martin Gansser - 0.3.2-14 -- Rebuilt for new VDR API version 2.7.5 - -* Fri Feb 28 2025 Martin Gansser - 0.3.2-13 -- Rebuilt for new VDR API version 2.7.4 - -* Sun Jan 19 2025 Fedora Release Engineering - 0.3.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Nov 11 2024 Dominik Mierzejewski - 0.3.2-11 -- rebuild for tinyxml2 - -* Tue Oct 22 2024 Richard W.M. Jones - 0.3.2-10 -- Rebuild for Jansson 2.14 - (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/3PYINSQGKQ4BB25NQUI2A2UCGGLAG5ND/) - -* Wed Oct 09 2024 Martin Gansser - 0.3.2-9 -- Rebuilt for new VDR API version 2.7.2 - -* Fri Jul 26 2024 Miroslav Suchý - 0.3.2-8 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 0.3.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jul 15 2024 Martin Gansser - 0.3.2-6 -- Rebuilt for new VDR API version 2.6.9 - -* Fri Jul 12 2024 Martin Gansser - 0.3.2-5 -- Rebuilt for new VDR API version 2.6.8 - -* Fri Apr 12 2024 Martin Gansser - 0.3.2-4 -- Rebuilt for new VDR API version - -* Fri Jan 26 2024 Martin Gansser - 0.3.2-3 -- Rebuilt for new VDR API version - -* Fri Jan 05 2024 Martin Gansser - 0.3.2-2 -- Rebuilt for new VDR API version -- Add BR gettext for rawhide - -* Mon Oct 23 2023 Martin Gansser - 0.3.2-1 -- Update to 0.3.2 - -* Wed Oct 18 2023 Martin Gansser - 0.3.1-1 -- Update to 0.3.1 - -* Wed Oct 11 2023 Martin Gansser - 0.3.0-1 -- Update to 0.3.0 - -* Sat Jul 22 2023 Fedora Release Engineering - 0.2.58-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Mon Mar 20 2023 Martin Gansser - 0.2.58-1 -- Update to 0.2.58 - -* Sun Mar 12 2023 Martin Gansser - 0.2.56-1 -- Update to 0.2.56 - -* Sat Jan 21 2023 Fedora Release Engineering - 0.2.54-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Dec 14 2022 Martin Gansser - 0.2.54-16 -- Rebuilt for new VDR API version - -* Thu Dec 01 2022 Martin Gansser - 0.2.54-15 -- Rebuilt for new VDR API version - -* Sun Sep 25 2022 Rich Mattes - 0.2.54-14 -- Rebuild for tinyxml2-9.0.0 - -* Sat Jul 23 2022 Fedora Release Engineering - 0.2.54-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Feb 22 2022 Martin Gansser - 0.2.54-12 -- Rebuilt due an SONAME bump of libwebsockets to 4.3.1 - -* Fri Feb 04 2022 Martin Gansser - 0.2.54-11 -- Rebuilt for new VDR API version - -* Sat Jan 22 2022 Fedora Release Engineering - 0.2.54-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Dec 30 2021 Martin Gansser - 0.2.54-9 -- Rebuilt for new VDR API version - -* Thu Aug 26 2021 Martin Gansser - 0.2.54-8 -- Rebuilt due an SONAME bump of libwebsockets to 4.2.0 - -* Fri Jul 30 2021 Martin Gansser - 0.2.54-7 -- Add %%{name}-ambiguous.patch fixes (BZ#1988033) - -* Fri Jul 23 2021 Fedora Release Engineering - 0.2.54-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Apr 28 2021 Martin Gansser - 0.2.54-5 -- Rebuilt for new VDR API version - -* Wed Jan 27 2021 Fedora Release Engineering - 0.2.54-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sun Jan 03 2021 Martin Gansser - 0.2.54-3 -- Rebuilt for new VDR API version - * Wed Oct 21 2020 Martin Gansser - 0.2.54-2 - Rebuilt for new VDR API version