diff --git a/vdr-epg2vdr-mariadb-fix-build.patch b/vdr-epg2vdr-mariadb-fix-build.patch new file mode 100644 index 0000000..72d868b --- /dev/null +++ b/vdr-epg2vdr-mariadb-fix-build.patch @@ -0,0 +1,23 @@ +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.spec b/vdr-epg2vdr.spec index 929357b..ab78252 100644 --- a/vdr-epg2vdr.spec +++ b/vdr-epg2vdr.spec @@ -1,12 +1,14 @@ Name: vdr-epg2vdr Version: 1.1.73 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A plugin to retrieve EPG data from a mysql database into VDR Group: Applications/Multimedia 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 +# https://bugzilla.redhat.com/attachment.cgi?id=1298505 +Patch0: %{name}-mariadb-fix-build.patch BuildRequires: sqlite-devel BuildRequires: openssl-devel @@ -34,6 +36,7 @@ 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 +%patch0 -p1 %build @@ -55,6 +58,9 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} %changelog +* Thu Jul 20 2017 Martin Gansser - 1.1.73-2 +- Add %%{name}-mariadb-fix-build.patch fixes (BZ#1298505). + * Thu Jun 29 2017 Martin Gansser - 1.1.73-1 - Update to 1.1.73