From 5340596042d66e5df9fafc7a5ac62edb761ce677 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:50:34 +0000 Subject: [PATCH 01/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-epg2vdr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 8c0b574..4af8182 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -1,6 +1,6 @@ Name: vdr-epg2vdr Version: 1.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL+ @@ -55,6 +55,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Jan 04 2022 Martin Gansser - 1.2.5-1 - Update to 1.2.5 From 7551c56dc37570ec3aaa1eab1dd325719142a5e6 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 4 Feb 2022 13:15:59 +0100 Subject: [PATCH 02/51] Rebuilt for new VDR API version --- vdr-epg2vdr.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 4af8182..a0af33a 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -1,6 +1,6 @@ Name: vdr-epg2vdr Version: 1.2.5 -Release: 2%{?dist} +Release: 4%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL+ @@ -35,6 +35,8 @@ was loaded from a mysql database. iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README # disable AUX patch sed -i -e 's|WITH_AUX_PATCH = 1|#WITH_AUX_PATCH = 1|' Make.config +# use python3 +sed -i -e 's|PYTHON ?= python|PYTHON ?= python3|' Make.config %build export CFLAGS="%{optflags}" @@ -55,6 +57,12 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Fri Feb 04 2022 Martin Gansser - 1.2.5-4 +- Rebuilt for new VDR API version + +* Fri Jan 28 2022 Martin Gansser - 1.2.5-3 +- Changing python to python3 in Make.config + * Sat Jan 22 2022 Fedora Release Engineering - 1.2.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 55a2c1586e2944ea0dee2f9879b1316ec0342e82 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 12 Feb 2022 18:53:50 +0100 Subject: [PATCH 03/51] Update to 1.2.6 --- .gitignore | 1 + sources | 2 +- vdr-epg2vdr.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 27c222a..96e935f 100644 --- a/.gitignore +++ b/.gitignore @@ -91,3 +91,4 @@ /vdr-plugin-epg2vdr-1.2.0.tar.bz2 /vdr-plugin-epg2vdr-1.2.3.tar.bz2 /vdr-plugin-epg2vdr-1.2.5.tar.bz2 +/vdr-plugin-epg2vdr-1.2.6.tar.bz2 diff --git a/sources b/sources index 48a54a6..29b2467 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-plugin-epg2vdr-1.2.5.tar.bz2) = ad5fc1f502321e399b230d4a9900ed6a634926d48541425a358e7c49c157b4ebd688526feb21cdb1428b568b37decd8ba2aa820436423729f4929edc6a68545c +SHA512 (vdr-plugin-epg2vdr-1.2.6.tar.bz2) = f28803c560209b65f68293b70ae7a21c323cac8804af1d0f459a7e3e53ab1ac9dcfce78a741b77b07a2f3b53814f79d17160a923fec19dfc8dacad1843b939a5 diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index a0af33a..48531ac 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -1,6 +1,6 @@ Name: vdr-epg2vdr -Version: 1.2.5 -Release: 4%{?dist} +Version: 1.2.6 +Release: 1%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL+ @@ -57,6 +57,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Sat Feb 12 2022 Martin Gansser - 1.2.6-1 +- Update to 1.2.6 + * Fri Feb 04 2022 Martin Gansser - 1.2.5-4 - Rebuilt for new VDR API version From 65f92392858c9cb43f01e2fa654abc122e2f7f6b Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 30 Apr 2022 16:25:34 +0200 Subject: [PATCH 04/51] A Update to 1.2.7 --- .gitignore | 1 + sources | 2 +- vdr-epg2vdr.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 96e935f..96502dc 100644 --- a/.gitignore +++ b/.gitignore @@ -92,3 +92,4 @@ /vdr-plugin-epg2vdr-1.2.3.tar.bz2 /vdr-plugin-epg2vdr-1.2.5.tar.bz2 /vdr-plugin-epg2vdr-1.2.6.tar.bz2 +/vdr-plugin-epg2vdr-1.2.7.tar.bz2 diff --git a/sources b/sources index 29b2467..fedf07b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-plugin-epg2vdr-1.2.6.tar.bz2) = f28803c560209b65f68293b70ae7a21c323cac8804af1d0f459a7e3e53ab1ac9dcfce78a741b77b07a2f3b53814f79d17160a923fec19dfc8dacad1843b939a5 +SHA512 (vdr-plugin-epg2vdr-1.2.7.tar.bz2) = 3b456ccb03050b92b3fa5d4cfbc628f2221c0a01d133cd413d37f534fbfc7a502dbd3e5e9dc77cad56261abe1f676a0316239397a65be67e7b2f4030c8475337 diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 48531ac..9698208 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -1,5 +1,5 @@ Name: vdr-epg2vdr -Version: 1.2.6 +Version: 1.2.7 Release: 1%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR @@ -57,6 +57,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Sat Apr 30 2022 Martin Gansser - 1.2.7-1 +A Update to 1.2.7 + * Sat Feb 12 2022 Martin Gansser - 1.2.6-1 - Update to 1.2.6 From 579c00fbc906831362ad24f29986e9be3d7109ac Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 15:43:06 +0200 Subject: [PATCH 05/51] Rebuilt for Python 3.11 --- vdr-epg2vdr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 9698208..bff4742 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -1,6 +1,6 @@ Name: vdr-epg2vdr Version: 1.2.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL+ @@ -57,6 +57,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Mon Jun 13 2022 Python Maint - 1.2.7-2 +- Rebuilt for Python 3.11 + * Sat Apr 30 2022 Martin Gansser - 1.2.7-1 A Update to 1.2.7 From d06f5a5a80ad1f3ea2ce7e47f02a93031c225126 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:44:22 +0000 Subject: [PATCH 06/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-epg2vdr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index bff4742..8ae28a2 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -1,6 +1,6 @@ Name: vdr-epg2vdr Version: 1.2.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL+ @@ -57,6 +57,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.2.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 1.2.7-2 - Rebuilt for Python 3.11 From 88d1a88ce3760758775f16862bc844a6b24274a2 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 4 Aug 2022 11:53:26 +0200 Subject: [PATCH 07/51] Update to new github address Update to 1.2.8 --- .gitignore | 1 + sources | 2 +- vdr-epg2vdr.spec | 25 +++++++++++++++++++------ 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 96502dc..7c9392c 100644 --- a/.gitignore +++ b/.gitignore @@ -93,3 +93,4 @@ /vdr-plugin-epg2vdr-1.2.5.tar.bz2 /vdr-plugin-epg2vdr-1.2.6.tar.bz2 /vdr-plugin-epg2vdr-1.2.7.tar.bz2 +/vdr-epg2vdr-1.2.8.tar.gz diff --git a/sources b/sources index fedf07b..d092961 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-plugin-epg2vdr-1.2.7.tar.bz2) = 3b456ccb03050b92b3fa5d4cfbc628f2221c0a01d133cd413d37f534fbfc7a502dbd3e5e9dc77cad56261abe1f676a0316239397a65be67e7b2f4030c8475337 +SHA512 (vdr-epg2vdr-1.2.8.tar.gz) = 58eadf290191204c22828ab3b3c52523c992e01c12546ed2a8f20ac2d690811c5165d52c2b6e6ec0ee214ba65c0d4aa7536ee50d0c5d36c974b46fd29ca8da64 diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 8ae28a2..8e74066 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -1,11 +1,20 @@ +# 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-epg2vdr -Version: 1.2.7 -Release: 3%{?dist} +Version: 1.2.8 +Release: 1%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL+ -URL: http://projects.vdr-developer.org/git/vdr-plugin-epg2vdr.git -Source0: https://projects.vdr-developer.org/git/vdr-plugin-epg2vdr.git/snapshot/vdr-plugin-epg2vdr-%{version}.tar.bz2 +URL: https://github.com/horchi/vdr-plugin-epg2vdr +Source0: %url/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: make BuildRequires: gcc-c++ @@ -19,7 +28,7 @@ BuildRequires: libxml2-devel BuildRequires: tinyxml2-devel BuildRequires: libjpeg-turbo-devel BuildRequires: imlib2-devel -BuildRequires: vdr-devel >= 1.7.36 +BuildRequires: vdr-devel >= %{vdr_version} BuildRequires: python3-devel BuildRequires: jansson-devel BuildRequires: libarchive-devel @@ -57,6 +66,10 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Thu Aug 04 2022 Martin Gansser - 1.2.8-1 +- Update to new github address +- Update to 1.2.8 + * Sat Jul 23 2022 Fedora Release Engineering - 1.2.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild @@ -64,7 +77,7 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} - Rebuilt for Python 3.11 * Sat Apr 30 2022 Martin Gansser - 1.2.7-1 -A Update to 1.2.7 +- Update to 1.2.7 * Sat Feb 12 2022 Martin Gansser - 1.2.6-1 - Update to 1.2.6 From 715e23563980c4d0ec533b76c83f1083cebd9ed5 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Sun, 25 Sep 2022 14:52:10 -0400 Subject: [PATCH 08/51] Rebuild for tinyxml2-9.0.0 --- vdr-epg2vdr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 8e74066..28be1dd 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -9,7 +9,7 @@ Name: vdr-epg2vdr Version: 1.2.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL+ @@ -66,6 +66,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Sun Sep 25 2022 Rich Mattes - 1.2.8-2 +- Rebuild for tinyxml2-9.0.0 + * Thu Aug 04 2022 Martin Gansser - 1.2.8-1 - Update to new github address - Update to 1.2.8 From 582888c206e4d5fabdd60802cdef5cc3985c5e4f Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 1 Dec 2022 17:35:55 +0100 Subject: [PATCH 09/51] Rebuilt for new VDR API version --- vdr-epg2vdr.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 28be1dd..635d764 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -1,15 +1,12 @@ # 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 +%if 0%{?fedora} >= 38 +%global vdr_version 2.6.2 %endif Name: vdr-epg2vdr Version: 1.2.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL+ @@ -66,6 +63,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Thu Dec 01 2022 Martin Gansser - 1.2.8-3 +- Rebuilt for new VDR API version + * Sun Sep 25 2022 Rich Mattes - 1.2.8-2 - Rebuild for tinyxml2-9.0.0 From 483888ec124aedb94d4fe391289ba3e6bf48b130 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 14 Dec 2022 16:07:05 +0100 Subject: [PATCH 10/51] Rebuilt for new VDR API version --- vdr-epg2vdr.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 635d764..d92a642 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -1,12 +1,12 @@ # version we want build against %global vdr_version 2.6.1 %if 0%{?fedora} >= 38 -%global vdr_version 2.6.2 +%global vdr_version 2.6.3 %endif Name: vdr-epg2vdr Version: 1.2.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL+ @@ -63,6 +63,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Wed Dec 14 2022 Martin Gansser - 1.2.8-4 +- Rebuilt for new VDR API version + * Thu Dec 01 2022 Martin Gansser - 1.2.8-3 - Rebuilt for new VDR API version From 0e1e18eb4d3738b3ff80ff61500c4caacac4e346 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 24 Dec 2022 12:20:38 +0100 Subject: [PATCH 11/51] Update to 1.2.9 --- .gitignore | 1 + sources | 2 +- vdr-epg2vdr.spec | 9 ++- vps.epg2vdr.txt | 160 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 169 insertions(+), 3 deletions(-) create mode 100644 vps.epg2vdr.txt diff --git a/.gitignore b/.gitignore index 7c9392c..391c512 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,4 @@ /vdr-plugin-epg2vdr-1.2.6.tar.bz2 /vdr-plugin-epg2vdr-1.2.7.tar.bz2 /vdr-epg2vdr-1.2.8.tar.gz +/vdr-epg2vdr-1.2.9.tar.gz diff --git a/sources b/sources index d092961..c1b2057 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-epg2vdr-1.2.8.tar.gz) = 58eadf290191204c22828ab3b3c52523c992e01c12546ed2a8f20ac2d690811c5165d52c2b6e6ec0ee214ba65c0d4aa7536ee50d0c5d36c974b46fd29ca8da64 +SHA512 (vdr-epg2vdr-1.2.9.tar.gz) = 12e62681981e388dc19ad1f51f6e58655b910c3da659b9c6788195271bbcef84caa51df72f8826bfb99f15d68a1392131333bc6f8554c7dee3345bd34d822174 diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index d92a642..1d33fc7 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -5,13 +5,15 @@ %endif Name: vdr-epg2vdr -Version: 1.2.8 -Release: 4%{?dist} +Version: 1.2.9 +Release: 1%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL+ URL: https://github.com/horchi/vdr-plugin-epg2vdr Source0: %url/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz +# https://www.vdr-portal.de/index.php?attachment/47223-vps-epg2vdr-txt/ +Patch0: vps.epg2vdr.txt BuildRequires: make BuildRequires: gcc-c++ @@ -63,6 +65,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Sat Dec 24 2022 Martin Gansser - 1.2.9-1 +- Update to 1.2.9 + * Wed Dec 14 2022 Martin Gansser - 1.2.8-4 - Rebuilt for new VDR API version diff --git a/vps.epg2vdr.txt b/vps.epg2vdr.txt new file mode 100644 index 0000000..0044840 --- /dev/null +++ b/vps.epg2vdr.txt @@ -0,0 +1,160 @@ +Index: vdr-plugin-epg2vdr-1.2.9/handler.h +=================================================================== +--- vdr-plugin-epg2vdr-1.2.9.orig/handler.h 2022-12-22 09:02:41.104757343 +0100 ++++ vdr-plugin-epg2vdr-1.2.9/handler.h 2022-12-24 11:45:58.543278919 +0100 +@@ -409,6 +409,7 @@ + + virtual bool HandledExternally(const cChannel* Channel) + { ++ handledByUs = false; + static int reportFirst = yes; + + LogDuration l("HandledExternally", 5); +@@ -430,8 +431,10 @@ + + // dbConnected() here okay -> if not connected we return false an the vdr will handle the event?!? + +- if (dbConnected() && getExternalIdOfChannel(&channelId) != "") ++ if (dbConnected() && getExternalIdOfChannel(&channelId) != "") { ++ handledByUs = true; + return true; ++ } + + return false; + } +@@ -453,6 +456,53 @@ + } + + //*************************************************************************** ++ // SetEventID ++ //*************************************************************************** ++ ++ virtual bool SetEventID(cEvent *Event, tEventID EventID) { ++// do we handle this channel? ++ if (!handledByUs) return false; ++ return true; ++// our use IDs don't change ++/* ++ ++ eventsDb->clear(); ++ eventsDb->setValue("CHANNELID", channelId.ToString()); ++ eventsDb->setBigintValue("EVENTID", (long)EventID); ++ ++ if (eventsDb->find()) { ++ tEventID useID = eventsDb->getIntValue("USEID"); ++ Event->SetEventID(useID); ++ return true; ++ } ++ return false; ++*/ ++ } ++ ++ //*************************************************************************** ++ // Get event ++ //*************************************************************************** ++ ++ virtual bool GetEvent(cEvent **event, const cChannel *channel, const cSchedule *schedule, const SI::EIT::Event *siEitEvent, uchar tableID) { ++// do we handle this channel? ++ if (!handledByUs) return false; ++ *event = NULL; ++ ++ if (tableID == 0x4E || (tableID & 0xF0) == 0x50) { ++ eventsDb->clear(); ++ eventsDb->setValue("CHANNELID", channelId.ToString()); ++ eventsDb->setBigintValue("EVENTID", (long)siEitEvent->getEventId()); ++ ++ if (eventsDb->find()) { ++ tEventID useID = eventsDb->getIntValue("USEID"); ++ *event = const_cast(schedule->GetEventById(useID)); ++ } ++ } else ++ *event = const_cast(schedule->GetEventByTime(siEitEvent->getStartTime() )); ++ return true; ++ } ++ ++ //*************************************************************************** + // Is Update + //*************************************************************************** + +@@ -746,7 +796,7 @@ + + selectEventByStarttime->freeResult(); + +- return true; ++ return false; // so other plugins can still get the event + } + + //*************************************************************************** +@@ -876,6 +926,7 @@ + std::map evtMemList; + std::map externIdMap; + tChannelID channelId; ++ bool handledByUs; // == EpgHandlers.HandledExternally(Channel); + + int initialized; + cDbConnection* connection; +@@ -980,6 +1031,18 @@ + return false; + } + ++ virtual bool SetEventID(cEvent *Event, tEventID EventID) ++ { ++ cEpgHandlerInstance* h = getHandler(); ++ return h->SetEventID(Event, EventID); ++ } ++ ++ virtual bool GetEvent(cEvent **event, const cChannel *channel, const cSchedule *schedule, const SI::EIT::Event *siEitEvent, uchar tableID) ++ { ++ cEpgHandlerInstance* h = getHandler(); ++ return h->GetEvent(event, channel, schedule, siEitEvent, tableID); ++ } ++ + virtual bool IsUpdate(tEventID EventID, time_t StartTime, uchar TableID, uchar Version) + { + +Index: vdr-plugin-epg2vdr-1.2.9/update.c +=================================================================== +--- vdr-plugin-epg2vdr-1.2.9.orig/update.c 2022-12-22 07:32:05.000000000 +0100 ++++ vdr-plugin-epg2vdr-1.2.9/update.c 2022-12-22 09:51:26.419974590 +0100 +@@ -1431,6 +1431,18 @@ + } + + //*************************************************************************** ++// Return true if any timer is in VPS margin ++//*************************************************************************** ++ ++bool timerInVpsMargin() ++{ ++ LOCK_TIMERS_WRITE; ++ for (cTimer* timer = Timers->First(); timer; timer = Timers->Next(timer)) ++ if (timer->InVpsMargin() ) return true; ++ return false; ++} ++ ++//*************************************************************************** + // Clear Epg + //*************************************************************************** + +@@ -1520,6 +1532,10 @@ + if (fullreload) + { + tell(1, "Removing all events from epg"); ++ if (timerInVpsMargin() ) { ++ tell(1, "Abort, as there is a timer in VPS margin"); ++ return fail; ++ } + + clearEpg(); + +@@ -1665,8 +1681,10 @@ + } + } + +- if (timer) ++ if (timer) { ++ if (timer->InVpsMargin() ) continue; // ignore events in vps margin, especially don't set the timer to no event. + timer->SetEvent(0); ++ } + + s->DelEvent((cEvent*)event); + } From 0e87160d7ba33d8625f56eb4c55035d989ad452d Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 24 Dec 2022 12:24:55 +0100 Subject: [PATCH 12/51] Update to 1.2.9 Add vps.epg2vdr.patch --- vdr-epg2vdr.spec | 3 ++- vps.epg2vdr.txt => vps.epg2vdr.patch | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename vps.epg2vdr.txt => vps.epg2vdr.patch (100%) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 1d33fc7..848f844 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -13,7 +13,7 @@ License: GPL+ URL: https://github.com/horchi/vdr-plugin-epg2vdr Source0: %url/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz # https://www.vdr-portal.de/index.php?attachment/47223-vps-epg2vdr-txt/ -Patch0: vps.epg2vdr.txt +Patch0: vps.epg2vdr.patch BuildRequires: make BuildRequires: gcc-c++ @@ -67,6 +67,7 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog * Sat Dec 24 2022 Martin Gansser - 1.2.9-1 - Update to 1.2.9 +- Add vps.epg2vdr.patch * Wed Dec 14 2022 Martin Gansser - 1.2.8-4 - Rebuilt for new VDR API version diff --git a/vps.epg2vdr.txt b/vps.epg2vdr.patch similarity index 100% rename from vps.epg2vdr.txt rename to vps.epg2vdr.patch From 7b7816a47308cf5989472ec24474abaf7fa099e9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:09:33 +0000 Subject: [PATCH 13/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-epg2vdr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 848f844..9b72d00 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -6,7 +6,7 @@ Name: vdr-epg2vdr Version: 1.2.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL+ @@ -65,6 +65,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.2.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Dec 24 2022 Martin Gansser - 1.2.9-1 - Update to 1.2.9 - Add vps.epg2vdr.patch From 5c81b24512744795be4475b02d2456943c75dc37 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 25 Jan 2023 16:54:16 +0100 Subject: [PATCH 14/51] Update to 1.2.12 --- .gitignore | 1 + sources | 2 +- vdr-epg2vdr.spec | 9 +++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 391c512..3138ace 100644 --- a/.gitignore +++ b/.gitignore @@ -95,3 +95,4 @@ /vdr-plugin-epg2vdr-1.2.7.tar.bz2 /vdr-epg2vdr-1.2.8.tar.gz /vdr-epg2vdr-1.2.9.tar.gz +/vdr-epg2vdr-1.2.12.tar.gz diff --git a/sources b/sources index c1b2057..dbfa7c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-epg2vdr-1.2.9.tar.gz) = 12e62681981e388dc19ad1f51f6e58655b910c3da659b9c6788195271bbcef84caa51df72f8826bfb99f15d68a1392131333bc6f8554c7dee3345bd34d822174 +SHA512 (vdr-epg2vdr-1.2.12.tar.gz) = c0f77296757a8c7ce06e7353491f26e1a21c57e5bc72df35a9b0c28386650f51863c760f582191365db7861c288faf6ee096cce81a3f052c834f9e88e5464e74 diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 9b72d00..8b19215 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -5,8 +5,8 @@ %endif Name: vdr-epg2vdr -Version: 1.2.9 -Release: 2%{?dist} +Version: 1.2.12 +Release: 1%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL+ @@ -43,8 +43,6 @@ was loaded from a mysql database. iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README # disable AUX patch sed -i -e 's|WITH_AUX_PATCH = 1|#WITH_AUX_PATCH = 1|' Make.config -# use python3 -sed -i -e 's|PYTHON ?= python|PYTHON ?= python3|' Make.config %build export CFLAGS="%{optflags}" @@ -65,6 +63,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Wed Jan 25 2023 Martin Gansser - 1.2.12-1 +- Update to 1.2.12 + * Sat Jan 21 2023 Fedora Release Engineering - 1.2.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From b772019329c2d33aa805a8b8c49a881ed60bd75a Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 14 Feb 2023 09:24:21 +0100 Subject: [PATCH 15/51] Update to 1.2.13 --- .gitignore | 1 + sources | 2 +- vdr-epg2vdr.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3138ace..f18ee32 100644 --- a/.gitignore +++ b/.gitignore @@ -96,3 +96,4 @@ /vdr-epg2vdr-1.2.8.tar.gz /vdr-epg2vdr-1.2.9.tar.gz /vdr-epg2vdr-1.2.12.tar.gz +/vdr-epg2vdr-1.2.13.tar.gz diff --git a/sources b/sources index dbfa7c8..d5fe8a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-epg2vdr-1.2.12.tar.gz) = c0f77296757a8c7ce06e7353491f26e1a21c57e5bc72df35a9b0c28386650f51863c760f582191365db7861c288faf6ee096cce81a3f052c834f9e88e5464e74 +SHA512 (vdr-epg2vdr-1.2.13.tar.gz) = df0cd3af1fae36b31f45949d77767fc30a66b17a5f41b40dd1f0673aaa786b1ace006409bf199c70319c8b0c063ed965f76f4210d21eaec9d6da55436833811c diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 8b19215..44c1a40 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -5,7 +5,7 @@ %endif Name: vdr-epg2vdr -Version: 1.2.12 +Version: 1.2.13 Release: 1%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR @@ -63,6 +63,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Sun Feb 12 2023 Martin Gansser - 1.2.13-1 +- Update to 1.2.13 + * Wed Jan 25 2023 Martin Gansser - 1.2.12-1 - Update to 1.2.12 From b17aa3cff3643af8b9d7b1f40738acb0dabce74c Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 15 Feb 2023 08:13:35 +0100 Subject: [PATCH 16/51] Update to 1.2.14 --- .gitignore | 1 + sources | 2 +- vdr-epg2vdr.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f18ee32..20ce2ba 100644 --- a/.gitignore +++ b/.gitignore @@ -97,3 +97,4 @@ /vdr-epg2vdr-1.2.9.tar.gz /vdr-epg2vdr-1.2.12.tar.gz /vdr-epg2vdr-1.2.13.tar.gz +/vdr-epg2vdr-1.2.14.tar.gz diff --git a/sources b/sources index d5fe8a4..3a0b592 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-epg2vdr-1.2.13.tar.gz) = df0cd3af1fae36b31f45949d77767fc30a66b17a5f41b40dd1f0673aaa786b1ace006409bf199c70319c8b0c063ed965f76f4210d21eaec9d6da55436833811c +SHA512 (vdr-epg2vdr-1.2.14.tar.gz) = f3876df630122cb97e05b66c5ea630802511d2768b3dc55cd72233b9b33269b790cea7b6eaab61ebea3c120e07f9ce3990bdb1cf09c21d1349476ee1d4c88820 diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 44c1a40..00de9e8 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -5,7 +5,7 @@ %endif Name: vdr-epg2vdr -Version: 1.2.13 +Version: 1.2.14 Release: 1%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR @@ -63,6 +63,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Wed Feb 15 2023 Martin Gansser - 1.2.14-1 +- Update to 1.2.14 + * Sun Feb 12 2023 Martin Gansser - 1.2.13-1 - Update to 1.2.13 From ca8e3849e3117f99e0772e1ffc49ac5f89c1a45e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 21:00:08 +0200 Subject: [PATCH 17/51] Rebuilt for Python 3.12 --- vdr-epg2vdr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 00de9e8..d2d7237 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -6,7 +6,7 @@ Name: vdr-epg2vdr Version: 1.2.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL+ @@ -63,6 +63,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Tue Jun 13 2023 Python Maint - 1.2.14-2 +- Rebuilt for Python 3.12 + * Wed Feb 15 2023 Martin Gansser - 1.2.14-1 - Update to 1.2.14 From c79c759c3f4190f5460c963ffba7979cf8010488 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:28:37 +0000 Subject: [PATCH 18/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-epg2vdr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index d2d7237..5633cba 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -6,7 +6,7 @@ Name: vdr-epg2vdr Version: 1.2.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL+ @@ -63,6 +63,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.2.14-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jun 13 2023 Python Maint - 1.2.14-2 - Rebuilt for Python 3.12 From 11ff9fc14eb363aa6d132fb145377adeb63c2abc Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 17 Oct 2023 13:15:18 +0200 Subject: [PATCH 19/51] Update to 1.2.15 --- .gitignore | 1 + sources | 2 +- vdr-epg2vdr.spec | 9 +++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 20ce2ba..06df5ee 100644 --- a/.gitignore +++ b/.gitignore @@ -98,3 +98,4 @@ /vdr-epg2vdr-1.2.12.tar.gz /vdr-epg2vdr-1.2.13.tar.gz /vdr-epg2vdr-1.2.14.tar.gz +/vdr-epg2vdr-1.2.15.tar.gz diff --git a/sources b/sources index 3a0b592..f4a8064 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-epg2vdr-1.2.14.tar.gz) = f3876df630122cb97e05b66c5ea630802511d2768b3dc55cd72233b9b33269b790cea7b6eaab61ebea3c120e07f9ce3990bdb1cf09c21d1349476ee1d4c88820 +SHA512 (vdr-epg2vdr-1.2.15.tar.gz) = 09730bd43c1c4f43b7b8be8fc20d97b94c8fa311e855318b453fb9f0a9a004dc1d634af924c31a81299da4b3d02567d75e1c9bef793e81d8070d39443ad38c44 diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 5633cba..dc22ccf 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -5,15 +5,13 @@ %endif Name: vdr-epg2vdr -Version: 1.2.14 -Release: 3%{?dist} +Version: 1.2.15 +Release: 1%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL+ URL: https://github.com/horchi/vdr-plugin-epg2vdr Source0: %url/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz -# https://www.vdr-portal.de/index.php?attachment/47223-vps-epg2vdr-txt/ -Patch0: vps.epg2vdr.patch BuildRequires: make BuildRequires: gcc-c++ @@ -63,6 +61,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Tue Oct 17 2023 Martin Gansser - 1.2.15-1 +- Update to 1.2.15 + * Sat Jul 22 2023 Fedora Release Engineering - 1.2.14-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 5b280c277aa2cdb32958e99c09e95777176d3e5c Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 5 Jan 2024 16:28:14 +0100 Subject: [PATCH 20/51] Rebuilt for new VDR API version --- vdr-epg2vdr.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index dc22ccf..c266b25 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -1,12 +1,12 @@ # version we want build against -%global vdr_version 2.6.1 -%if 0%{?fedora} >= 38 %global vdr_version 2.6.3 +%if 0%{?fedora} >= 40 +%global vdr_version 2.6.5 %endif Name: vdr-epg2vdr Version: 1.2.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL+ @@ -61,6 +61,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Fri Jan 05 2024 Martin Gansser - 1.2.15-2 +- Rebuilt for new VDR API version + * Tue Oct 17 2023 Martin Gansser - 1.2.15-1 - Update to 1.2.15 From 3d28c7a13167d33fbdee41485873907a2942911d Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 5 Jan 2024 16:35:41 +0100 Subject: [PATCH 21/51] Rebuilt for new VDR API versionA Add BR gettext for rawhide --- vdr-epg2vdr.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index c266b25..08f9e8f 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -15,6 +15,7 @@ Source0: %url/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar BuildRequires: make BuildRequires: gcc-c++ +BuildRequires: gettext BuildRequires: sqlite-devel BuildRequires: openssl-devel BuildRequires: mariadb-connector-c-devel @@ -62,7 +63,8 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog * Fri Jan 05 2024 Martin Gansser - 1.2.15-2 -- Rebuilt for new VDR API version +- Rebuilt for new VDR API versionA +- Add BR gettext for rawhide * Tue Oct 17 2023 Martin Gansser - 1.2.15-1 - Update to 1.2.15 From 0ba2a95530d84ce5ec05e66b19e7d1f8a02042e9 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 21 Jan 2024 19:57:48 +0100 Subject: [PATCH 22/51] Update to 1.2.16 --- .gitignore | 1 + sources | 2 +- vdr-epg2vdr.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 06df5ee..e77c0dd 100644 --- a/.gitignore +++ b/.gitignore @@ -99,3 +99,4 @@ /vdr-epg2vdr-1.2.13.tar.gz /vdr-epg2vdr-1.2.14.tar.gz /vdr-epg2vdr-1.2.15.tar.gz +/vdr-epg2vdr-1.2.16.tar.gz diff --git a/sources b/sources index f4a8064..5ac992a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-epg2vdr-1.2.15.tar.gz) = 09730bd43c1c4f43b7b8be8fc20d97b94c8fa311e855318b453fb9f0a9a004dc1d634af924c31a81299da4b3d02567d75e1c9bef793e81d8070d39443ad38c44 +SHA512 (vdr-epg2vdr-1.2.16.tar.gz) = 3e4a6e9343db3d7c97e2a6fd291132df41580cd3a7e6e3ce6f9ae013e80029156be5198ce7f6408930fb25c18d6e58f7761bbcc0b5a286a824078396182220f6 diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 08f9e8f..584a2ad 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -5,8 +5,8 @@ %endif Name: vdr-epg2vdr -Version: 1.2.15 -Release: 2%{?dist} +Version: 1.2.16 +Release: 1%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL+ @@ -62,6 +62,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Sun Jan 21 2024 Martin Gansser - 1.2.16-1 +- Update to 1.2.16 + * Fri Jan 05 2024 Martin Gansser - 1.2.15-2 - Rebuilt for new VDR API versionA - Add BR gettext for rawhide From 1596d7e4ebd912c388ac2ad64bce545766ebb117 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 26 Jan 2024 11:11:40 +0100 Subject: [PATCH 23/51] Rebuilt for new VDR API version --- vdr-epg2vdr.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 584a2ad..cb16ad6 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -1,12 +1,12 @@ # version we want build against %global vdr_version 2.6.3 %if 0%{?fedora} >= 40 -%global vdr_version 2.6.5 +%global vdr_version 2.6.6 %endif Name: vdr-epg2vdr Version: 1.2.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL+ @@ -62,6 +62,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Fri Jan 26 2024 Martin Gansser - 1.2.16-2 +- Rebuilt for new VDR API version + * Sun Jan 21 2024 Martin Gansser - 1.2.16-1 - Update to 1.2.16 From 81220d5fe451e64f6b3769eb11b4c55ada4448f9 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 12 Apr 2024 14:44:56 +0200 Subject: [PATCH 24/51] Rebuilt for new VDR API version --- vdr-epg2vdr.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index cb16ad6..233f9b5 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -1,12 +1,12 @@ # version we want build against %global vdr_version 2.6.3 %if 0%{?fedora} >= 40 -%global vdr_version 2.6.6 +%global vdr_version 2.6.7 %endif Name: vdr-epg2vdr Version: 1.2.16 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL+ @@ -62,6 +62,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Fri Apr 12 2024 Martin Gansser - 1.2.16-3 +- Rebuilt for new VDR API version + * Fri Jan 26 2024 Martin Gansser - 1.2.16-2 - Rebuilt for new VDR API version From 5c8a3165eaf144d6ecb9dceef94450194c6f9de6 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 09:12:20 +0200 Subject: [PATCH 25/51] Rebuilt for Python 3.13 --- vdr-epg2vdr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 233f9b5..762b212 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -6,7 +6,7 @@ Name: vdr-epg2vdr Version: 1.2.16 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL+ @@ -62,6 +62,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Fri Jun 07 2024 Python Maint - 1.2.16-4 +- Rebuilt for Python 3.13 + * Fri Apr 12 2024 Martin Gansser - 1.2.16-3 - Rebuilt for new VDR API version From 30ad20ec44ae3a1b9a61e4f78f0b007983f30c19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 17 Jun 2024 16:18:29 +0200 Subject: [PATCH 26/51] convert GPL+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- vdr-epg2vdr.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 762b212..cd8ac70 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -6,10 +6,10 @@ Name: vdr-epg2vdr Version: 1.2.16 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR -License: GPL+ +License: GPL-1.0-or-later URL: https://github.com/horchi/vdr-plugin-epg2vdr Source0: %url/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -62,6 +62,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Mon Jun 17 2024 Miroslav Suchý - 1.2.16-5 +- convert license to SPDX + * Fri Jun 07 2024 Python Maint - 1.2.16-4 - Rebuilt for Python 3.13 From 747a2991b2117edf4efc51f42266342b39332e10 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 11 Jul 2024 14:10:24 +0200 Subject: [PATCH 27/51] Rebuilt for new VDR API version 2.6.8 --- vdr-epg2vdr.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index cd8ac70..e0e8f4f 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -1,12 +1,12 @@ # version we want build against %global vdr_version 2.6.3 %if 0%{?fedora} >= 40 -%global vdr_version 2.6.7 +%global vdr_version 2.6.8 %endif Name: vdr-epg2vdr Version: 1.2.16 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL-1.0-or-later @@ -62,6 +62,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Thu Jul 11 2024 Martin Gansser - 1.2.16-6 +- Rebuilt for new VDR API version 2.6.8 + * Mon Jun 17 2024 Miroslav Suchý - 1.2.16-5 - convert license to SPDX From 881d3eafe1c3dfddbfcd828b969727d693d10d55 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 15 Jul 2024 16:08:59 +0200 Subject: [PATCH 28/51] Rebuilt for new VDR API version 2.6.9 --- vdr-epg2vdr.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index e0e8f4f..c5db23c 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -1,12 +1,12 @@ # version we want build against %global vdr_version 2.6.3 %if 0%{?fedora} >= 40 -%global vdr_version 2.6.8 +%global vdr_version 2.6.9 %endif Name: vdr-epg2vdr Version: 1.2.16 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL-1.0-or-later @@ -62,6 +62,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Mon Jul 15 2024 Martin Gansser - 1.2.16-7 +- Rebuilt for new VDR API version 2.6.9 + * Thu Jul 11 2024 Martin Gansser - 1.2.16-6 - Rebuilt for new VDR API version 2.6.8 From 09b0fdc5acc28c49f3f9524b9785c93b06af8ff2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:37:55 +0000 Subject: [PATCH 29/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- vdr-epg2vdr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index c5db23c..d6929bb 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -6,7 +6,7 @@ Name: vdr-epg2vdr Version: 1.2.16 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL-1.0-or-later @@ -62,6 +62,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.2.16-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jul 15 2024 Martin Gansser - 1.2.16-7 - Rebuilt for new VDR API version 2.6.9 From 3315f5183238aa10bd2eb81e03da1e5f1184abdc Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 9 Oct 2024 14:12:06 +0200 Subject: [PATCH 30/51] Rebuilt for new VDR API version 2.7.2 Add %{name}-EventID.diff for vdr 2.7.x --- vdr-epg2vdr-EventID.diff | 80 ++++++++++++++++++++++++++++++++++++++++ vdr-epg2vdr.spec | 15 ++++++-- 2 files changed, 92 insertions(+), 3 deletions(-) create mode 100644 vdr-epg2vdr-EventID.diff diff --git a/vdr-epg2vdr-EventID.diff b/vdr-epg2vdr-EventID.diff new file mode 100644 index 0000000..3195a9f --- /dev/null +++ b/vdr-epg2vdr-EventID.diff @@ -0,0 +1,80 @@ +diff --git a/menusched.c b/menusched.c +index 3e4bbee6..bab904d0 100644 +--- a/menusched.c ++++ b/menusched.c +@@ -781,7 +781,11 @@ int cMenuEpgWhatsOn::LoadSearch(const cUserTimes::UserTime* userTime) + const char* strChannelId = menuDb->useeventsDb->getStrValue("CHANNELID"); + const cChannel* channel = channels->GetByChannelID(tChannelID::FromString(strChannelId)); + const cSchedule* schedule = schedules->GetSchedule(channel); ++#if (defined (APIVERSNUM) && (APIVERSNUM >= 20501)) ++ const cEvent* event = !schedule ? 0 : schedule->GetEventById(menuDb->useeventsDb->getIntValue("USEID")); ++#else + const cEvent* event = !schedule ? 0 : schedule->GetEvent(menuDb->useeventsDb->getIntValue("USEID")); ++#endif + + if (event) + Add(new cMenuEpgScheduleItem(menuDb, event, channel, yes)); +diff --git a/recording.c b/recording.c +index 64a7cf53..f218aea2 100644 +--- a/recording.c ++++ b/recording.c +@@ -432,7 +432,11 @@ int cUpdate::updateRecordingTable(int fullReload) + cStateKey schedulesKey; + const cSchedules* schedules = cSchedules::GetSchedulesRead(schedulesKey, 500/*ms*/); + const cSchedule* s = schedules ? (cSchedule*)schedules->GetSchedule(channel) : 0; ++#if (defined (APIVERSNUM) && (APIVERSNUM >= 20501)) ++ const cEvent* event = s ? s->GetEventById(eventId) : 0; ++#else + const cEvent* event = s ? s->GetEvent(eventId) : 0; ++#endif + + if (event && !isEmpty(event->Aux()) && xml.set(event->Aux()) == success) + { +diff --git a/timer.c b/timer.c +index 13a314c6..e751aadb 100644 +--- a/timer.c ++++ b/timer.c +@@ -301,7 +301,11 @@ int cUpdate::performTimerJobs() + continue; + } + ++#if (defined (APIVERSNUM) && (APIVERSNUM >= 20501)) ++ if (eventid > 0 && !(event = s->GetEventById(eventid))) ++#else + if (eventid > 0 && !(event = s->GetEvent(eventid))) ++#endif + { + const cChannel* channel = channels->GetByChannelID(channelId); + +diff --git a/ttools.c b/ttools.c +index 21530fd4..3e317d7a 100644 +--- a/ttools.c ++++ b/ttools.c +@@ -466,7 +466,11 @@ cEpgTimer* newTimerObjectFromRow(cDbRow* timerRow, cDbRow* vdrRow) + const cSchedule* schedule = schedules->GetSchedule(channel); + + if (schedule) ++#if (defined (APIVERSNUM) && (APIVERSNUM >= 20501)) ++ event = schedule->GetEventById(timerRow->getIntValue("EVENTID")); ++#else + event = schedule->GetEvent(timerRow->getIntValue("EVENTID")); ++#endif + } + + #if defined (APIVERSNUM) && (APIVERSNUM >= 20301) +diff --git a/update.c b/update.c +index 32c80317..ef630fa7 100644 +--- a/update.c ++++ b/update.c +@@ -1646,7 +1646,11 @@ int cUpdate::refreshEpg(const char* forChannelId, int maxTries) + + // get event / timer + ++#if APIVERSNUM > 20501 ++ if ((event = s->GetEventById(eventsDb->getIntValue("USEID")))) ++#else + if ((event = s->GetEvent(eventsDb->getIntValue("USEID")))) ++#endif + { + if (Us::isRemove(updFlg)) + tell(2, "Remove event %uld of channel '%s' due to updflg %c", diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index d6929bb..b435826 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -1,17 +1,22 @@ -# version we want build against +# version we want to build against %global vdr_version 2.6.3 -%if 0%{?fedora} >= 40 +# Set vdr_version based on Fedora version +%if 0%{?fedora} >= 42 +%global vdr_version 2.7.2 +%elif 0%{?fedora} >= 40 %global vdr_version 2.6.9 %endif Name: vdr-epg2vdr Version: 1.2.16 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL-1.0-or-later URL: https://github.com/horchi/vdr-plugin-epg2vdr Source0: %url/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz +# https://github.com/kfb77/vdr-plugin-epg2vdr/commit/0f5caa2739a1adf5669c128df96cf0b102a2cb34.diff +Patch0: %{name}-EventID.diff BuildRequires: make BuildRequires: gcc-c++ @@ -62,6 +67,10 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Wed Oct 09 2024 Martin Gansser - 1.2.16-9 +- Rebuilt for new VDR API version 2.7.2 +- Add %%{name}-EventID.diff for vdr 2.7.x + * Sat Jul 20 2024 Fedora Release Engineering - 1.2.16-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From e2c5ee0d088dbe4213bed69e7513be388804bc73 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 22 Oct 2024 13:40:39 +0100 Subject: [PATCH 31/51] Rebuild for Jansson 2.14 (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/3PYINSQGKQ4BB25NQUI2A2UCGGLAG5ND/) --- vdr-epg2vdr.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index b435826..59096e1 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -9,7 +9,7 @@ Name: vdr-epg2vdr Version: 1.2.16 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL-1.0-or-later @@ -67,6 +67,10 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Tue Oct 22 2024 Richard W.M. Jones - 1.2.16-10 +- Rebuild for Jansson 2.14 + (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/3PYINSQGKQ4BB25NQUI2A2UCGGLAG5ND/) + * Wed Oct 09 2024 Martin Gansser - 1.2.16-9 - Rebuilt for new VDR API version 2.7.2 - Add %%{name}-EventID.diff for vdr 2.7.x From 61cc86143bf06172d15146d91cfc2bc62e32125b Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 11 Nov 2024 23:45:46 +0000 Subject: [PATCH 32/51] rebuild for tinyxml2 --- vdr-epg2vdr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 59096e1..84306e3 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -9,7 +9,7 @@ Name: vdr-epg2vdr Version: 1.2.16 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL-1.0-or-later @@ -67,6 +67,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Mon Nov 11 2024 Dominik Mierzejewski - 1.2.16-11 +- rebuild for tinyxml2 + * Tue Oct 22 2024 Richard W.M. Jones - 1.2.16-10 - Rebuild for Jansson 2.14 (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/3PYINSQGKQ4BB25NQUI2A2UCGGLAG5ND/) From 806a0705e6290bdc285947e8899ee276ead5d504 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:10:45 +0000 Subject: [PATCH 33/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- vdr-epg2vdr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 84306e3..bba165c 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -9,7 +9,7 @@ Name: vdr-epg2vdr Version: 1.2.16 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL-1.0-or-later @@ -67,6 +67,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.2.16-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Nov 11 2024 Dominik Mierzejewski - 1.2.16-11 - rebuild for tinyxml2 From f9ce85994ca26d26dc0bf23a53484630f83a792c Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 18 Feb 2025 18:23:01 +0100 Subject: [PATCH 34/51] Update to 1.2.17 --- .gitignore | 1 + sources | 2 +- vdr-epg2vdr.spec | 9 +++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e77c0dd..b15f974 100644 --- a/.gitignore +++ b/.gitignore @@ -100,3 +100,4 @@ /vdr-epg2vdr-1.2.14.tar.gz /vdr-epg2vdr-1.2.15.tar.gz /vdr-epg2vdr-1.2.16.tar.gz +/vdr-epg2vdr-1.2.17.tar.gz diff --git a/sources b/sources index 5ac992a..5fb09d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-epg2vdr-1.2.16.tar.gz) = 3e4a6e9343db3d7c97e2a6fd291132df41580cd3a7e6e3ce6f9ae013e80029156be5198ce7f6408930fb25c18d6e58f7761bbcc0b5a286a824078396182220f6 +SHA512 (vdr-epg2vdr-1.2.17.tar.gz) = 56c56cc0b46584e4e326779ab3b685f11eca1f9492e9209bc9e7d85897b3aaf44010bc37d0558a78ae64d0d4e6795a58bdb2074a06e5f196ee2d4aac170c79eb diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index bba165c..1eed943 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -8,15 +8,13 @@ %endif Name: vdr-epg2vdr -Version: 1.2.16 -Release: 12%{?dist} +Version: 1.2.17 +Release: 1%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL-1.0-or-later URL: https://github.com/horchi/vdr-plugin-epg2vdr Source0: %url/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz -# https://github.com/kfb77/vdr-plugin-epg2vdr/commit/0f5caa2739a1adf5669c128df96cf0b102a2cb34.diff -Patch0: %{name}-EventID.diff BuildRequires: make BuildRequires: gcc-c++ @@ -67,6 +65,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Tue Feb 18 2025 Martin Gansser - 1.2.17-1 +- Update to 1.2.17 + * Sun Jan 19 2025 Fedora Release Engineering - 1.2.16-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 688cc8b74eaa9ff9ce2deee9b1286633090ac6f4 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 28 Feb 2025 10:35:18 +0100 Subject: [PATCH 35/51] Rebuilt for new VDR API version 2.7.4 --- vdr-epg2vdr-EventID.diff | 80 ---------------------------------------- vdr-epg2vdr.spec | 11 +++--- 2 files changed, 6 insertions(+), 85 deletions(-) delete mode 100644 vdr-epg2vdr-EventID.diff diff --git a/vdr-epg2vdr-EventID.diff b/vdr-epg2vdr-EventID.diff deleted file mode 100644 index 3195a9f..0000000 --- a/vdr-epg2vdr-EventID.diff +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/menusched.c b/menusched.c -index 3e4bbee6..bab904d0 100644 ---- a/menusched.c -+++ b/menusched.c -@@ -781,7 +781,11 @@ int cMenuEpgWhatsOn::LoadSearch(const cUserTimes::UserTime* userTime) - const char* strChannelId = menuDb->useeventsDb->getStrValue("CHANNELID"); - const cChannel* channel = channels->GetByChannelID(tChannelID::FromString(strChannelId)); - const cSchedule* schedule = schedules->GetSchedule(channel); -+#if (defined (APIVERSNUM) && (APIVERSNUM >= 20501)) -+ const cEvent* event = !schedule ? 0 : schedule->GetEventById(menuDb->useeventsDb->getIntValue("USEID")); -+#else - const cEvent* event = !schedule ? 0 : schedule->GetEvent(menuDb->useeventsDb->getIntValue("USEID")); -+#endif - - if (event) - Add(new cMenuEpgScheduleItem(menuDb, event, channel, yes)); -diff --git a/recording.c b/recording.c -index 64a7cf53..f218aea2 100644 ---- a/recording.c -+++ b/recording.c -@@ -432,7 +432,11 @@ int cUpdate::updateRecordingTable(int fullReload) - cStateKey schedulesKey; - const cSchedules* schedules = cSchedules::GetSchedulesRead(schedulesKey, 500/*ms*/); - const cSchedule* s = schedules ? (cSchedule*)schedules->GetSchedule(channel) : 0; -+#if (defined (APIVERSNUM) && (APIVERSNUM >= 20501)) -+ const cEvent* event = s ? s->GetEventById(eventId) : 0; -+#else - const cEvent* event = s ? s->GetEvent(eventId) : 0; -+#endif - - if (event && !isEmpty(event->Aux()) && xml.set(event->Aux()) == success) - { -diff --git a/timer.c b/timer.c -index 13a314c6..e751aadb 100644 ---- a/timer.c -+++ b/timer.c -@@ -301,7 +301,11 @@ int cUpdate::performTimerJobs() - continue; - } - -+#if (defined (APIVERSNUM) && (APIVERSNUM >= 20501)) -+ if (eventid > 0 && !(event = s->GetEventById(eventid))) -+#else - if (eventid > 0 && !(event = s->GetEvent(eventid))) -+#endif - { - const cChannel* channel = channels->GetByChannelID(channelId); - -diff --git a/ttools.c b/ttools.c -index 21530fd4..3e317d7a 100644 ---- a/ttools.c -+++ b/ttools.c -@@ -466,7 +466,11 @@ cEpgTimer* newTimerObjectFromRow(cDbRow* timerRow, cDbRow* vdrRow) - const cSchedule* schedule = schedules->GetSchedule(channel); - - if (schedule) -+#if (defined (APIVERSNUM) && (APIVERSNUM >= 20501)) -+ event = schedule->GetEventById(timerRow->getIntValue("EVENTID")); -+#else - event = schedule->GetEvent(timerRow->getIntValue("EVENTID")); -+#endif - } - - #if defined (APIVERSNUM) && (APIVERSNUM >= 20301) -diff --git a/update.c b/update.c -index 32c80317..ef630fa7 100644 ---- a/update.c -+++ b/update.c -@@ -1646,7 +1646,11 @@ int cUpdate::refreshEpg(const char* forChannelId, int maxTries) - - // get event / timer - -+#if APIVERSNUM > 20501 -+ if ((event = s->GetEventById(eventsDb->getIntValue("USEID")))) -+#else - if ((event = s->GetEvent(eventsDb->getIntValue("USEID")))) -+#endif - { - if (Us::isRemove(updFlg)) - tell(2, "Remove event %uld of channel '%s' due to updflg %c", diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 1eed943..3f4cb65 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -1,15 +1,13 @@ # version we want to build against -%global vdr_version 2.6.3 +%global vdr_version 2.6.9 # Set vdr_version based on Fedora version %if 0%{?fedora} >= 42 -%global vdr_version 2.7.2 -%elif 0%{?fedora} >= 40 -%global vdr_version 2.6.9 +%global vdr_version 2.7.4 %endif Name: vdr-epg2vdr Version: 1.2.17 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL-1.0-or-later @@ -65,6 +63,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Fri Feb 28 2025 Martin Gansser - 1.2.17-2 +- Rebuilt for new VDR API version 2.7.4 + * Tue Feb 18 2025 Martin Gansser - 1.2.17-1 - Update to 1.2.17 From 4e4f1b35ddee5c4c0d283a4f8a099bfc29b6d30a Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 27 May 2025 17:08:17 +0200 Subject: [PATCH 36/51] Rebuilt for new VDR API version 2.7.5 --- vdr-epg2vdr.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 3f4cb65..3f079ab 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -1,13 +1,15 @@ -# version we want to build against -%global vdr_version 2.6.9 # Set vdr_version based on Fedora version -%if 0%{?fedora} >= 42 +%if 0%{?fedora} >= 43 +%global vdr_version 2.7.5 +%elif 0%{?fedora} == 42 %global vdr_version 2.7.4 +%else +%global vdr_version 2.6.9 %endif Name: vdr-epg2vdr Version: 1.2.17 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL-1.0-or-later @@ -63,6 +65,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Tue May 27 2025 Martin Gansser - 1.2.17-3 +- Rebuilt for new VDR API version 2.7.5 + * Fri Feb 28 2025 Martin Gansser - 1.2.17-2 - Rebuilt for new VDR API version 2.7.4 From 87b77dd7fd240250b412e83ee9733e123705af64 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 20:53:54 +0200 Subject: [PATCH 37/51] Rebuilt for Python 3.14 --- vdr-epg2vdr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 3f079ab..d893d9a 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -9,7 +9,7 @@ Name: vdr-epg2vdr Version: 1.2.17 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL-1.0-or-later @@ -65,6 +65,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Mon Jun 02 2025 Python Maint - 1.2.17-4 +- Rebuilt for Python 3.14 + * Tue May 27 2025 Martin Gansser - 1.2.17-3 - Rebuilt for new VDR API version 2.7.5 From 6433dfdbbe1cd9a2d45f706a1874353ff437ef7d Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 22 Jun 2025 12:23:50 +0200 Subject: [PATCH 38/51] Rebuilt for new VDR API version 2.7.6 --- vdr-epg2vdr.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index d893d9a..aada9bf 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -1,6 +1,6 @@ # Set vdr_version based on Fedora version %if 0%{?fedora} >= 43 -%global vdr_version 2.7.5 +%global vdr_version 2.7.6 %elif 0%{?fedora} == 42 %global vdr_version 2.7.4 %else @@ -65,8 +65,8 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog -* Mon Jun 02 2025 Python Maint - 1.2.17-4 -- Rebuilt for Python 3.14 +* Sat Jun 21 2025 Martin Gansser - 1.2.17-4 +- Rebuilt for new VDR API version 2.7.6 * Tue May 27 2025 Martin Gansser - 1.2.17-3 - Rebuilt for new VDR API version 2.7.5 From 6dd7d5938cfca52ba2e2b45a0e47a1ea2b66ee35 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 22 Jun 2025 21:56:27 +0200 Subject: [PATCH 39/51] Rebuilt for new VDR API version 2.7.6 --- vdr-epg2vdr.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index aada9bf..e99d3ac 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -9,7 +9,7 @@ Name: vdr-epg2vdr Version: 1.2.17 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL-1.0-or-later @@ -65,9 +65,12 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog -* Sat Jun 21 2025 Martin Gansser - 1.2.17-4 +* Sat Jun 21 2025 Martin Gansser - 1.2.17-5 - Rebuilt for new VDR API version 2.7.6 +* Mon Jun 02 2025 Python Maint - 1.2.17-4 +- Rebuilt for Python 3.14 + * Tue May 27 2025 Martin Gansser - 1.2.17-3 - Rebuilt for new VDR API version 2.7.5 From 9bc1b1bb8145ce1f455ddae85cc41ea2da758a83 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:00:12 +0000 Subject: [PATCH 40/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- vdr-epg2vdr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index e99d3ac..0ceacc0 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -9,7 +9,7 @@ Name: vdr-epg2vdr Version: 1.2.17 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL-1.0-or-later @@ -65,6 +65,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.2.17-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jun 21 2025 Martin Gansser - 1.2.17-5 - Rebuilt for new VDR API version 2.7.6 From 70977b51fa468e372d7ea5fcd7ec36db23fc038e Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 27 Jul 2025 18:28:35 +0200 Subject: [PATCH 41/51] Rebuilt for new VDR API version 2.7.7 --- vdr-epg2vdr.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 0ceacc0..4c675dd 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -1,6 +1,6 @@ # Set vdr_version based on Fedora version %if 0%{?fedora} >= 43 -%global vdr_version 2.7.6 +%global vdr_version 2.7.7 %elif 0%{?fedora} == 42 %global vdr_version 2.7.4 %else @@ -9,7 +9,7 @@ Name: vdr-epg2vdr Version: 1.2.17 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL-1.0-or-later @@ -65,6 +65,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Fri Jul 25 2025 Martin Gansser - 1.2.17-7 +- Rebuilt for new VDR API version 2.7.7 + * Fri Jul 25 2025 Fedora Release Engineering - 1.2.17-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 97d9b9d6632a9e301aca5617e5fcf0c6d610d9b6 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 23 Aug 2025 07:13:01 -0400 Subject: [PATCH 42/51] Rebuilt for tinyxml2 11.0.0 --- vdr-epg2vdr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 4c675dd..e2bcfa5 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -9,7 +9,7 @@ Name: vdr-epg2vdr Version: 1.2.17 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL-1.0-or-later @@ -65,6 +65,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Sat Aug 23 2025 Benjamin A. Beasley - 1.2.17-8 +- Rebuilt for tinyxml2 11.0.0 + * Fri Jul 25 2025 Martin Gansser - 1.2.17-7 - Rebuilt for new VDR API version 2.7.7 From d3378286e07a92ff8e0949be858957ba99107bd6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:49:29 +0000 Subject: [PATCH 43/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- vdr-epg2vdr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index e2bcfa5..fa137de 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -9,7 +9,7 @@ Name: vdr-epg2vdr Version: 1.2.17 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL-1.0-or-later @@ -65,6 +65,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.2.17-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Sat Aug 23 2025 Benjamin A. Beasley - 1.2.17-8 - Rebuilt for tinyxml2 11.0.0 From 4a4b9be66c92f17c5845f71cfbaf6bfea4df70b3 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 26 Jan 2026 17:02:03 +0100 Subject: [PATCH 44/51] Rebuilt for new VDR API version 2.7.8 --- vdr-epg2vdr.spec | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index fa137de..b806cba 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -1,15 +1,18 @@ # 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 +# Default %global vdr_version 2.6.9 + +%if 0%{?fedora} == 42 +%global vdr_version 2.7.4 +%elif 0%{?fedora} == 43 +%global vdr_version 2.7.7 +%elif 0%{?fedora} >= 44 +%global vdr_version 2.7.8 %endif Name: vdr-epg2vdr Version: 1.2.17 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL-1.0-or-later @@ -65,6 +68,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Mon Jan 26 2026 Martin Gansser - 1.2.17-10 +- Rebuilt for new VDR API version 2.7.8 + * Sat Jan 17 2026 Fedora Release Engineering - 1.2.17-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 545341d20b54f7d37cc07b385a8aa9c5a86dfddf Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 9 Feb 2026 11:23:23 +0100 Subject: [PATCH 45/51] Rebuilt for new VDR API version 2.7.9 --- vdr-epg2vdr.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index b806cba..c7542b6 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -7,12 +7,12 @@ %elif 0%{?fedora} == 43 %global vdr_version 2.7.7 %elif 0%{?fedora} >= 44 -%global vdr_version 2.7.8 +%global vdr_version 2.7.9 %endif Name: vdr-epg2vdr Version: 1.2.17 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL-1.0-or-later @@ -68,6 +68,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Mon Feb 09 2026 Martin Gansser - 1.2.17-11 +- Rebuilt for new VDR API version 2.7.9 + * Mon Jan 26 2026 Martin Gansser - 1.2.17-10 - Rebuilt for new VDR API version 2.7.8 From 74bf093cef9c99eab0c632e1a4b99ade19afbf19 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 23 Mar 2026 16:21:04 +0000 Subject: [PATCH 46/51] Rebuilt for new VDR 2.8.1 API version 12 --- vdr-epg2vdr.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index c7542b6..36871d4 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -7,12 +7,12 @@ %elif 0%{?fedora} == 43 %global vdr_version 2.7.7 %elif 0%{?fedora} >= 44 -%global vdr_version 2.7.9 +%global vdr_version 2.8.1 %endif Name: vdr-epg2vdr Version: 1.2.17 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL-1.0-or-later @@ -68,6 +68,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Mon Mar 23 2026 Martin Gansser - 1.2.17-12 +- Rebuilt for new VDR 2.8.1 API version 12 + * Mon Feb 09 2026 Martin Gansser - 1.2.17-11 - Rebuilt for new VDR API version 2.7.9 From 541c4629b9f84839f55424491f19cc7275c195f7 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 3 Jun 2026 11:35:23 +0200 Subject: [PATCH 47/51] =?UTF-8?q?Update=20SPEC=20f=C3=BCr=20vdr-epg2vdr?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vdr-epg2vdr.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 36871d4..cee8f3b 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -1,18 +1,18 @@ # Set vdr_version based on Fedora version # Default -%global vdr_version 2.6.9 - -%if 0%{?fedora} == 42 -%global vdr_version 2.7.4 -%elif 0%{?fedora} == 43 %global vdr_version 2.7.7 -%elif 0%{?fedora} >= 44 + +%if 0%{?fedora} == 43 +%global vdr_version 2.7.7 +%elif 0%{?fedora} == 44 %global vdr_version 2.8.1 +%elif 0%{?fedora} > 44 +%global vdr_version 2.8.2 %endif Name: vdr-epg2vdr Version: 1.2.17 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL-1.0-or-later @@ -68,6 +68,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Wed Jun 03 2026 Martin Gansser - 1.2.17-13 +- Rebuilt for new VDR 2.8.2 API version 13 + * Mon Mar 23 2026 Martin Gansser - 1.2.17-12 - Rebuilt for new VDR 2.8.1 API version 12 From fe3ff33d3948ed7f92f3bee304b70db70693001b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 3 Jun 2026 17:50:09 +0200 Subject: [PATCH 48/51] Rebuilt for Python 3.15 --- vdr-epg2vdr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index cee8f3b..03bd545 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -12,7 +12,7 @@ Name: vdr-epg2vdr Version: 1.2.17 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL-1.0-or-later @@ -68,6 +68,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Wed Jun 03 2026 Python Maint - 1.2.17-14 +- Rebuilt for Python 3.15 + * Wed Jun 03 2026 Martin Gansser - 1.2.17-13 - Rebuilt for new VDR 2.8.2 API version 13 From 89e65a9d3bbda21a8ebf0b5aec6f4f8569782f1e Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 12 Jun 2026 20:02:06 -0400 Subject: [PATCH 49/51] Rebuilt for openssl 4.0 --- vdr-epg2vdr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 03bd545..827c058 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -12,7 +12,7 @@ Name: vdr-epg2vdr Version: 1.2.17 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL-1.0-or-later @@ -68,6 +68,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Sat Jun 13 2026 Yaakov Selkowitz - 1.2.17-15 +- Rebuilt for openssl 4.0 + * Wed Jun 03 2026 Python Maint - 1.2.17-14 - Rebuilt for Python 3.15 From 90486c26ee9fc582d6a46ae9f89d05b34c6e551d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:24:12 +0000 Subject: [PATCH 50/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- vdr-epg2vdr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 827c058..8d7f02e 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -12,7 +12,7 @@ Name: vdr-epg2vdr Version: 1.2.17 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL-1.0-or-later @@ -68,6 +68,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.2.17-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jun 13 2026 Yaakov Selkowitz - 1.2.17-15 - Rebuilt for openssl 4.0 From 21219f929e0d7bbef5447dcd66456caf096f7796 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 22 Jul 2026 10:20:13 +0200 Subject: [PATCH 51/51] Rebuilt for Python 3.15.0b4 ABI change --- vdr-epg2vdr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epg2vdr.spec b/vdr-epg2vdr.spec index 8d7f02e..43aa961 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -12,7 +12,7 @@ Name: vdr-epg2vdr Version: 1.2.17 -Release: 16%{?dist} +Release: 17%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR License: GPL-1.0-or-later @@ -68,6 +68,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Wed Jul 22 2026 Python Maint - 1.2.17-17 +- Rebuilt for Python 3.15.0b4 ABI change + * Fri Jul 17 2026 Fedora Release Engineering - 1.2.17-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild