From 9bd0dad971edb4d502e7e5affcd9074614e9d077 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 31 Dec 2021 12:18:34 +0100 Subject: [PATCH 1/2] Update to 1.2.0 --- vdr-epg2vdr-2.5.4.patch | 14 -------------- vdr-epg2vdr-epg.patch | 10 ---------- vdr-epg2vdr-gcc10-include.patch | 11 ----------- vdr-epg2vdr-mariadb-fix-build.patch | 23 ----------------------- vdr-epg2vdr-py38.patch | 15 --------------- 5 files changed, 73 deletions(-) delete mode 100644 vdr-epg2vdr-2.5.4.patch delete mode 100644 vdr-epg2vdr-epg.patch delete mode 100644 vdr-epg2vdr-gcc10-include.patch delete mode 100644 vdr-epg2vdr-mariadb-fix-build.patch delete mode 100644 vdr-epg2vdr-py38.patch diff --git a/vdr-epg2vdr-2.5.4.patch b/vdr-epg2vdr-2.5.4.patch deleted file mode 100644 index 68c7dc3..0000000 --- a/vdr-epg2vdr-2.5.4.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/Makefile b/Makefile -index 931aabe..3260efd 100644 ---- a/Makefile -+++ b/Makefile -@@ -49,8 +49,8 @@ TMPDIR ?= /tmp - - ### The compiler options: - --export CFLAGS += $(call PKGCFG,cflags) --export CXXFLAGS += $(call PKGCFG,cxxflags) -+export CFLAGS += $(call PKGCFG,cflags) -DDEPRECATED_SKIN_SETITEMEVENT=1 -+export CXXFLAGS += $(call PKGCFG,cxxflags) -DDEPRECATED_SKIN_SETITEMEVENT=1 - - ### The version number of VDR's plugin API: diff --git a/vdr-epg2vdr-epg.patch b/vdr-epg2vdr-epg.patch deleted file mode 100644 index 1849a77..0000000 --- a/vdr-epg2vdr-epg.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- vdr-plugin-epg2vdr-1.1.115/lib/common.c.old 2020-08-17 08:18:50.747982757 +0200 -+++ vdr-plugin-epg2vdr-1.1.115/lib/common.c 2020-08-17 08:20:25.802976151 +0200 -@@ -379,6 +379,7 @@ - - toUpper(pattern); - removeWord(pattern, " TEIL "); -+ removeWord(pattern, "(TEIL "); - removeWord(pattern, " FOLGE "); - removeCharsExcept(pattern, notignore); - } diff --git a/vdr-epg2vdr-gcc10-include.patch b/vdr-epg2vdr-gcc10-include.patch deleted file mode 100644 index edf507f..0000000 --- a/vdr-epg2vdr-gcc10-include.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nrup a/service.h b/service.h ---- a/service.h 2018-10-15 12:42:08.000000000 -0600 -+++ b/service.h 2019-09-23 10:15:16.089840039 -0600 -@@ -13,6 +13,7 @@ - - #include - #include -+#include - - //*************************************************************************** - // Timer - Skin Interface diff --git a/vdr-epg2vdr-mariadb-fix-build.patch b/vdr-epg2vdr-mariadb-fix-build.patch deleted file mode 100644 index 72d868b..0000000 --- a/vdr-epg2vdr-mariadb-fix-build.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur vdr-plugin-epg2vdr-1.1.73-ORIG/lib/db.c vdr-plugin-epg2vdr-1.1.73/lib/db.c ---- vdr-plugin-epg2vdr-1.1.73-ORIG/lib/db.c 2017-07-14 17:23:56.366839376 +0200 -+++ vdr-plugin-epg2vdr-1.1.73/lib/db.c 2017-07-14 17:59:34.634451604 +0200 -@@ -1379,11 +1379,19 @@ - - if (error == CR_SERVER_LOST || - error == CR_SERVER_GONE_ERROR || -+// for compatibility with newer versions of MariaDB library -+#ifdef CR_INVALID_CONN_HANDLE - error == CR_INVALID_CONN_HANDLE || -+#endif - error == CR_COMMANDS_OUT_OF_SYNC || - error == CR_SERVER_LOST_EXTENDED || - error == CR_STMT_CLOSED || -+// for compatibility with newer versions of MariaDB library -+#ifdef CR_CONN_UNKNOW_PROTOCOL - error == CR_CONN_UNKNOW_PROTOCOL || -+#else -+ error == CR_CONN_UNKNOWN_PROTOCOL || -+#endif - error == CR_UNSUPPORTED_PARAM_TYPE || - error == CR_NO_PREPARE_STMT || - error == CR_SERVER_HANDSHAKE_ERR || diff --git a/vdr-epg2vdr-py38.patch b/vdr-epg2vdr-py38.patch deleted file mode 100644 index 799703a..0000000 --- a/vdr-epg2vdr-py38.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Makefile b/Makefile -index 1403938..d772309 100644 ---- a/Makefile -+++ b/Makefile -@@ -72,6 +72,10 @@ LIBS += $(shell pkg-config --libs uuid) - LIBS += $(shell pkg-config --libs tinyxml2) - LIBS += $(shell mysql_config --libs_r) $(shell python-config --libs) $(shell pkg-config --libs jansson) - -+ifeq ($(shell python -c 'import sys; sys.exit(0) if sys.version_info[:2] < (3,8) else print(1)'), 1) -+ LIBS += $(shell python-config --embed) -+endif -+ - EPG2VDR_DATA_DIR = "/var/cache/vdr" - - ifdef WITH_GTFT From 9d7bbf56e580f92097906ff16b00dd511eef2ce2 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 12 Feb 2022 18:59:08 +0100 Subject: [PATCH 2/2] Update to 1.2.6 --- .gitignore | 1 + sources | 2 +- vdr-epg2vdr.spec | 16 +++++++++++++++- 3 files changed, 17 insertions(+), 2 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 8c0b574..48531ac 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -1,5 +1,5 @@ Name: vdr-epg2vdr -Version: 1.2.5 +Version: 1.2.6 Release: 1%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR @@ -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,18 @@ 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 + +* 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 + * Tue Jan 04 2022 Martin Gansser - 1.2.5-1 - Update to 1.2.5