Update to 1.0.12

.gitignore

@@ -20,3 +20,4 @@
 /vdr-scraper2vdr-ef448e1.tar.gz
 /vdr-scraper2vdr-a412d52.tar.gz
 /vdr-scraper2vdr-d9f6cb4.tar.gz
+/vdr-scraper2vdr-1.0.12.tar.gz

scraper2vdr_serienposter_statt_banner.diff

@@ -0,0 +1,15 @@
+--- scrapmanager.c	2020-12-28 18:38:53.850634334 +0100
++++ scrapmanager.c.new	2020-12-28 18:44:09.536615518 +0100
+@@ -698,11 +698,7 @@ bool cScrapManager::GetPosterBannerV2(Sc
+ 		if (hitSeries == series.end())
+ 			return false;
+ 		cTVDBSeries *s = hitSeries->second;
+-		bool found = s->GetRandomBanner(&call->banner);
+-		if (v.episodeId > 0) {
+-			s->GetSeasonPoster(v.episodeId, &call->poster);
+-		}
+-		return found;
++		return s->GetPoster(&call->banner);
+ 	} else if (v.movieId > 0) {
+ 		call->type = tMovie;
+ 		map<int, cMovieDbMovie*>::iterator hitMovies = movies.find(v.movieId);

sources

@@ -1 +1 @@
-SHA512 (vdr-scraper2vdr-d9f6cb4.tar.gz) = 57fcd3b955e0c5a7d98da5f658cf167bc0b0b224c2a4b5e3c33535888a89f1d531548ab802285c53afca5c5b419f0fd27528abaf877314c2921c64f86681da44
+SHA512 (vdr-scraper2vdr-1.0.12.tar.gz) = fb9de76477494c43c6b4bfc8f298b7194726d2a6ce22c643f4ac7c757713a8010a1efd65536b20d121c1258b90015ab9435d36b302fdd1c85131ac91ea5fcd0c

vdr-scraper2vdr-mariadb-fix-build.patch

@@ -1,23 +0,0 @@
-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 ||

vdr-scraper2vdr.spec

@@ -6,24 +6,24 @@
 %global gitdate 20190128
 
 Name:           vdr-scraper2vdr
-Version:        1.0.11
-Release:        11.%{gitdate}git%{shortcommit0}%{?dist}
+Version:        1.0.12
+#Release:        15.%%{gitdate}git%%{shortcommit0}%%{?dist}
+Release:        1%{?dist}
 Summary:        A client plugin which provides scraped metadata from EPGD to other plugins
 License:        GPL+
 URL:            https://github.com/horchi/scraper2vdr
-Source0:        https://github.com/horchi/scraper2vdr/archive/%{commit0}/%{name}-%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz
+#Source0:        https://github.com/horchi/scraper2vdr/archive/%%{commit0}/%%{name}-%%{commit0}.tar.gz#/%%{name}-%%{shortcommit0}.tar.gz
+Source0:        https://github.com/horchi/scraper2vdr/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        %{name}.conf
+# https://www.vdr-portal.de/index.php?attachment/44795-scraper2vdr-serienposter-statt-banner-diff/
+Patch0:         scraper2vdr_serienposter_statt_banner.diff
 
-BuildRequires: make
+BuildRequires:  make
 BuildRequires:  gcc-c++
 BuildRequires:  libuuid-devel
 BuildRequires:  ImageMagick-c++-devel
 BuildRequires:  openssl-devel
-%if 0%{?fedora} <= 27
-BuildRequires:  mariadb-devel
-%else
 BuildRequires:  mariadb-connector-c-devel
-%endif
 BuildRequires:  libcurl-devel
 BuildRequires:  imlib2-devel
 BuildRequires:  vdr-devel >= 1.7.34
@@ -40,14 +40,16 @@ themoviedb.org API for movies. Check the websites of both services for
 the terms of use.
 
 %prep
-%setup -qn %{pname}-%{commit0}
+#%%autosetup -p0 -n %%{pname}-%%{commit0}
+%autosetup -p0 -n %{pname}-%{version}
 iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README
 
 # fedora specific
 sed -i -e 's|#include <errmsg.h>|#include <mysql/errmsg.h>|' lib/db.c
+sed -i -e 's|#include <mysql.h>|#include <mysql/mysql.h>|' lib/db.h
 
 %build
-make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %{?_smp_mflags} all
+%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC"
 
 %install
 %make_install
@@ -65,6 +67,24 @@ install -Dpm 644 %{SOURCE1} \
 %config(noreplace) %{vdr_configdir}/plugins/%{pname}/epg.dat
 
 %changelog
+* Wed Jan 05 2022 Martin Gansser <martinkg@fedoraproject.org> - 1.0.12-1
+- Update to 1.0.12
+
+* Thu Dec 30 2021 Martin Gansser <martinkg@fedoraproject.org> - 1.0.11-15.20190128gitd9f6cb4
+- Rebuilt for new VDR API version
+
+* Fri Nov 26 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.0.11-14.20190128gitd9f6cb4.1
+- rebuild for new ImageMagick
+
+* Fri Oct 29 2021 Martin Gansser <martinkg@fedoraproject.org> - 1.0.11-14.20190128gitd9f6cb4
+- Add scraper2vdr_serienposter_statt_banner.diff
+
+* Sat Oct 16 2021 Martin Gansser <martinkg@fedoraproject.org> - 1.0.11-13.20190128gitd9f6cb4
+- Rebuilt due FTI in rawhide
+
+* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 1.0.11-12.20190128gitd9f6cb4
+- Rebuilt with OpenSSL 3.0.0
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.11-11.20190128gitd9f6cb4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild