From c8e8e61576ea34d82eb4f311968bc5a2b4d71754 Mon Sep 17 00:00:00 2001 From: martinkg Date: Jul 20 2017 14:43:36 +0000 Subject: Add %{name}-mariadb-fix-build.patch fixes (BZ#1298509). --- diff --git a/vdr-scraper2vdr-mariadb-fix-build.patch b/vdr-scraper2vdr-mariadb-fix-build.patch new file mode 100644 index 0000000..b746e15 --- /dev/null +++ b/vdr-scraper2vdr-mariadb-fix-build.patch @@ -0,0 +1,23 @@ +diff -Naur scraper2vdr-254122b25833980410f6373b397dd3459cb642e9-ORIG/lib/db.c scraper2vdr-254122b25833980410f6373b397dd3459cb642e9/lib/db.c +--- scraper2vdr-254122b25833980410f6373b397dd3459cb642e9-ORIG/lib/db.c 2017-07-14 18:30:56.958885292 +0200 ++++ scraper2vdr-254122b25833980410f6373b397dd3459cb642e9/lib/db.c 2017-07-14 18:51:03.581320730 +0200 +@@ -1344,11 +1344,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-scraper2vdr.spec b/vdr-scraper2vdr.spec index bc4739f..cce6591 100644 --- a/vdr-scraper2vdr.spec +++ b/vdr-scraper2vdr.spec @@ -3,11 +3,11 @@ %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global pname scraper2vdr -%global gitdate 20161205 +%global gitdate 20170611 Name: vdr-scraper2vdr Version: 1.0.5 -Release: 1.%{gitdate}git%{shortcommit0}%{?dist} +Release: 2.%{gitdate}git%{shortcommit0}%{?dist} Summary: A client plugin which provides scraped metadata from EPGD to other plugins Group: Applications/Multimedia @@ -15,6 +15,8 @@ License: GPL+ URL: https://github.com/horchi/scraper2vdr Source0: https://github.com/horchi/scraper2vdr/archive/%{commit0}/%{name}-%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz Source1: %{name}.conf +# https://bugzilla.redhat.com/attachment.cgi?id=1298509 +Patch0: %{name}-mariadb-fix-build.patch BuildRequires: libuuid-devel BuildRequires: ImageMagick-c++-devel @@ -60,7 +62,10 @@ install -Dpm 644 %{SOURCE1} \ %config(noreplace) %{vdr_configdir}/plugins/%{pname}/epg.dat %changelog -* Mon Jun 12 2017 Martin Gansser - 1.0.3-1.20170611git254122b +* Thu Jul 20 2017 Martin Gansser - 1.0.5-2.20170611git254122b +- Add %%{name}-mariadb-fix-build.patch fixes (BZ#1298509). + +* Mon Jun 12 2017 Martin Gansser - 1.0.5-1.20170611git254122b - Update to 1.0.5-1.20170611git254122b * Sat Feb 11 2017 Fedora Release Engineering - 1.0.3-2.20161205gitc01f745