From 706293aedaceef5fb9f3b498a014ce27a99627e2 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: May 25 2018 12:02:40 +0000 Subject: Update to 1.1.141 Dropped %{name}-mariadb-fix-build.patch --- diff --git a/.gitignore b/.gitignore index 8ae6f7d..22a9fe5 100644 --- a/.gitignore +++ b/.gitignore @@ -144,3 +144,4 @@ /vdr-epg-daemon-1.1.137.tar.bz2 /vdr-epg-daemon-1.1.138.tar.bz2 /vdr-epg-daemon-1.1.140.tar.bz2 +/vdr-epg-daemon-1.1.141.tar.bz2 diff --git a/sources b/sources index ba1d702..d36b325 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-epg-daemon-1.1.140.tar.bz2) = 95122446173c3f65ec093b99f15b4813c3407edf4f6a1e1592196e89d8faa3198e53c2299c52c07c1914d9f5eada0cac4cb785b5421d6e14ccc1169409eae763 +SHA512 (vdr-epg-daemon-1.1.141.tar.bz2) = bfd4d0df8c80f764e43ab0881fcb42beb14cca2561dbb2391d5e961edaae1a8ec6448e4b2cb2fde45a61bbbbcbe6fdf4631950c556872660037b3be82f859a04 diff --git a/vdr-epg-daemon-mariadb-fix-build.patch b/vdr-epg-daemon-mariadb-fix-build.patch deleted file mode 100644 index 3f485e3..0000000 --- a/vdr-epg-daemon-mariadb-fix-build.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- lib/db.c 2017-07-14 16:42:52.762508183 +0200 -+++ lib/db.c 2017-07-14 16:55:49.289953172 +0200 -@@ -1376,11 +1376,19 @@ - - if (error == CR_SERVER_LOST || - error == CR_SERVER_GONE_ERROR || -+// for compatibility with newer versions of MariaBD 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 MariaBD 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-epg-daemon.spec b/vdr-epg-daemon.spec index 67319ef..beeb413 100644 --- a/vdr-epg-daemon.spec +++ b/vdr-epg-daemon.spec @@ -1,10 +1,8 @@ ## This macro activates/deactivates debug option %global without_debug 1 -##define _unpackaged_files_terminate_build 0 - Name: vdr-epg-daemon -Version: 1.1.140 +Version: 1.1.141 Release: 1%{?dist} Summary: A daemon to download EPG data from internet and manage it in a mysql database @@ -14,8 +12,6 @@ URL: http://projects.vdr-developer.org/projects/vdr-epg-daemon Source0: https://projects.vdr-developer.org/git/%{name}.git/snapshot/%{name}-%{version}.tar.bz2 # fix Optimization flags are not honored. Patch0: %{name}-makefile.patch -# https://bugzilla.redhat.com/attachment.cgi?id=1298401 -Patch1: %{name}-mariadb-fix-build.patch BuildRequires: libcurl-devel BuildRequires: libxslt-devel @@ -56,7 +52,6 @@ working environment. %prep %setup -qn %{name}-%{version} %patch0 -p0 -%patch1 -p0 iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README @@ -144,6 +139,10 @@ mkdir -p %{buildroot}%{_libdir}/mysql/plugin %{vdr_resdir}/epgd/ %changelog +* Fri May 25 2018 Martin Gansser - 1.1.141-1 +- Update to 1.1.141 +- Dropped %%{name}-mariadb-fix-build.patch + * Wed Apr 18 2018 Martin Gansser - 1.1.140-1 - Update to 1.1.140 - Rebuilt for vdr-2.4.0