From 8315f3c4064133fdf8d73214a22585d4ec885c1d Mon Sep 17 00:00:00 2001
From: Martin Gansser <mgansser@online.de>
Date: Fri, 12 Aug 2022 15:17:15 +0200
Subject: [PATCH 01/11] Update to 1.1.2-1

Add %{name}-f35.patch
---
 .gitignore              |   1 +
 sources                 |   2 +-
 vdr-tvscraper-f35.patch | 122 ++++++++++++++++++++++++++++++++++++++++
 vdr-tvscraper.spec      |  17 ++++--
 4 files changed, 137 insertions(+), 5 deletions(-)
 create mode 100644 vdr-tvscraper-f35.patch

diff --git a/.gitignore b/.gitignore
index 5d5c1c8..3f494e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /tvscraper-1.1.1.tar.gz
+/tvscraper-1.1.2.tar.gz
diff --git a/sources b/sources
index 4b91039..92fb019 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tvscraper-1.1.1.tar.gz) = a847301da26aac609479993614d0aa59d37d96895376a3f66c0ce4eb230e780e72c13131894801886ecb64ed2d3e70105c83b2a8ec7f1a7aa59938ee50d470e9
+SHA512 (tvscraper-1.1.2.tar.gz) = 5f3766cd3548f0eb8e04b5550b68989efc3495e7780f88017f1f8b3c27744a9d414ef81fd4821bebb64113b5e89da526e9ffa74b7e43b71ffcdb992cbcfd3ed5
diff --git a/vdr-tvscraper-f35.patch b/vdr-tvscraper-f35.patch
new file mode 100644
index 0000000..3f87e65
--- /dev/null
+++ b/vdr-tvscraper-f35.patch
@@ -0,0 +1,122 @@
+diff -Naur vdr-plugin-tvscraper-1.1.2/autoTimers.c vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/autoTimers.c
+--- vdr-plugin-tvscraper-1.1.2/autoTimers.c	2022-08-09 22:28:24.000000000 +0200
++++ vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/autoTimers.c	2022-08-12 09:15:11.000000000 +0200
+@@ -111,7 +111,11 @@
+     if (season_number == 0 && episode_number == 0) continue; // we look only for recordings we can assign to a specific episode/movie
+     if (season_number == -100) episode_number = 0;
+     bool hd = channelsHD.find((const char *)channelIDs) != channelsHD.end();
++#if VDRVERSNUM >= 20505
+     int numberOfErrors = rec->Info()->Errors();
++#else
++    int numberOfErrors = 0;
++#endif
+     cScraperRec scraperRec(eventID, eventStartTime, (const char *)channelIDs, rec->Name(), movie_tv_id, season_number, episode_number, hd, numberOfErrors);
+     auto found = recordings.find(scraperRec);
+     if (found == recordings.end() ) recordings.insert(std::move(scraperRec)); // not in list -> insert
+diff -Naur vdr-plugin-tvscraper-1.1.2/images.c vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/images.c
+--- vdr-plugin-tvscraper-1.1.2/images.c	2022-08-09 22:28:24.000000000 +0200
++++ vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/images.c	2022-08-12 09:15:11.000000000 +0200
+@@ -27,7 +27,7 @@
+ void cImageLevelsInt::findTopElement() {
+   int t = m_imageLevels;
+   for (m_push = 0; m_push < s_max_levels; m_push++) {
+-    if (t & 7 == 0) return;
++    if ((t & 7) == 0) return;
+     t = t >> 3;
+   }
+ }
+@@ -102,7 +102,7 @@
+ void cOrientationsInt::findTopElement() {
+   int t = m_orientations;
+   for (m_push = 0; m_push < s_max_orientations; m_push++) {
+-    if (t & 7 == 0) return;
++    if ((t & 7) == 0) return;
+     t = t >> 3;
+   }
+ }
+diff -Naur vdr-plugin-tvscraper-1.1.2/searchEventOrRec.c vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/searchEventOrRec.c
+--- vdr-plugin-tvscraper-1.1.2/searchEventOrRec.c	2022-08-09 22:28:24.000000000 +0200
++++ vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/searchEventOrRec.c	2022-08-12 09:15:11.000000000 +0200
+@@ -218,6 +218,7 @@
+     case scrapNone: ; // do nothing, nothing to store
+   }
+ }
++inline void swap(searchResultTvMovie &a, searchResultTvMovie &b) { std::swap(a, b); }
+ 
+ scrapType cSearchEventOrRec::ScrapFind(vector<searchResultTvMovie> &searchResults, string &movieName, string &episodeSearchString) {
+ //  bool debug = m_searchString == "james cameron's dark angel";
+@@ -234,7 +235,7 @@
+ // something was found. Add all information which is available for free
+   if (m_baseNameEquShortText) for (searchResultTvMovie &searchResult: searchResults) if (!searchResult.movie() && searchResult.delim() == 0) searchResult.setBaseNameEquShortText();
+   for (searchResultTvMovie &searchResult: searchResults) searchResult.setMatchYear(m_years, m_sEventOrRecording->DurationInSec() );
+-  sort(searchResults.begin(), searchResults.end() );
++  std::sort(searchResults.begin(), searchResults.end() );
+   if (debug) for (searchResultTvMovie &searchResult: searchResults) searchResult.log(m_searchString.c_str() );
+   m_episodeFound = false;
+   std::vector<searchResultTvMovie>::iterator new_end;
+@@ -436,7 +437,7 @@
+ 
+ // look for matches of part of the actor
+   const char *lPos = actor.c_str();
+-  for (const char *rDelimPos; rDelimPos = strchr(lPos, ' '); lPos = rDelimPos + 1)
++  for (const char *rDelimPos; (rDelimPos = strchr(lPos, ' ')); lPos = rDelimPos + 1)
+     addActor(description, lPos, rDelimPos - lPos, numMatchesFirst, alreadyFound);
+   addActor(description, lPos, 0, numMatchesSure, alreadyFound);
+ }
+@@ -516,7 +517,7 @@
+ // minDiff must be > 0, otherwise an empty list my be returned
+ //  bool debug = m_searchString == "james cameron's dark angel";
+   bool debug = false;
+-  float minDiffSame = max (minDiff - 0.05, 0.01);
++  float minDiffSame = std::max(minDiff - 0.05, 0.01);
+   float minDiffOther = minDiff;
+   new_end = end;
+   if (begin == end) return false; // empty list
+diff -Naur vdr-plugin-tvscraper-1.1.2/themoviedbscraper/moviedbmovie.c vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/themoviedbscraper/moviedbmovie.c
+--- vdr-plugin-tvscraper-1.1.2/themoviedbscraper/moviedbmovie.c	2022-08-09 22:28:24.000000000 +0200
++++ vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/themoviedbscraper/moviedbmovie.c	2022-08-12 09:15:11.000000000 +0200
+@@ -177,7 +177,7 @@
+ 
+         searchResultTvMovie sRes(id, true, json_string_value_validated(result, "release_date") );
+         sRes.setPositionInExternalResult(resultSet.size() );
+-        sRes.setMatchText(min(sentence_distance(resultTitle, SearchString), sentence_distance(resultOriginalTitle, SearchString) ) );
++        sRes.setMatchText(std::min(sentence_distance(resultTitle, SearchString), sentence_distance(resultOriginalTitle, SearchString) ) );
+         sRes.setPopularity(json_number_value_validated(result, "popularity"), json_number_value_validated(result, "vote_average"), json_integer_value_validated(result, "vote_count") );
+         resultSet.push_back(sRes);
+     }
+diff -Naur vdr-plugin-tvscraper-1.1.2/themoviedbscraper/moviedbtv.c vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/themoviedbscraper/moviedbtv.c
+--- vdr-plugin-tvscraper-1.1.2/themoviedbscraper/moviedbtv.c	2022-08-09 22:28:24.000000000 +0200
++++ vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/themoviedbscraper/moviedbtv.c	2022-08-12 09:15:11.000000000 +0200
+@@ -131,7 +131,7 @@
+ 
+             searchResultTvMovie sRes(id, false, json_string_value_validated(result, "release_date") );
+             sRes.setPositionInExternalResult(resultSet.size() );
+-            sRes.setMatchText(min(sentence_distance(resultName, tvSearchString), sentence_distance(resultOriginalName, tvSearchString) )  + 1); // avaid this, prefer TVDB
++            sRes.setMatchText(std::min(sentence_distance(resultName, tvSearchString), sentence_distance(resultOriginalName, tvSearchString) )  + 1); // avaid this, prefer TVDB
+             sRes.setPopularity(json_number_value_validated(result, "popularity"), json_number_value_validated(result, "vote_average"), json_integer_value_validated(result, "vote_count") );
+             resultSet.push_back(sRes);
+         }
+diff -Naur vdr-plugin-tvscraper-1.1.2/thetvdbscraper/tvdbseries.c vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/thetvdbscraper/tvdbseries.c
+--- vdr-plugin-tvscraper-1.1.2/thetvdbscraper/tvdbseries.c	2022-08-09 22:28:24.000000000 +0200
++++ vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/thetvdbscraper/tvdbseries.c	2022-08-12 09:15:11.000000000 +0200
+@@ -73,7 +73,7 @@
+     int dist_a = sentence_distance(name, SearchString);
+     if (debug) esyslog("tvscraper: series SearchString %s, name %s, distance %i", SearchString.c_str(), name.c_str(), dist_a);
+ // (2013) or similar at the end of a name in thetvdb indicates a year. This year is not given in the EPG. 
+-    if (StringRemoveLastPartWithP(name) ) dist_a = min(dist_a, sentence_distance(name, SearchString) );
++    if (StringRemoveLastPartWithP(name) ) dist_a = std::min(dist_a, sentence_distance(name, SearchString) );
+     std::size_t lDelim = aliasNames.find('|');
+     if (lDelim !=std::string::npos) {
+       for (std::size_t rDelim = aliasNames.find('|', lDelim +1); rDelim != std::string::npos; rDelim = aliasNames.find('|', lDelim +1) ) {
+diff -Naur vdr-plugin-tvscraper-1.1.2/tools/stringhelpers.c vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/tools/stringhelpers.c
+--- vdr-plugin-tvscraper-1.1.2/tools/stringhelpers.c	2022-08-09 22:28:24.000000000 +0200
++++ vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/tools/stringhelpers.c	2022-08-12 09:15:11.000000000 +0200
+@@ -52,7 +52,7 @@
+ // if len == 0: use strlen(needle) characters of needle
+ 
+   if (len == 0) return strstr(haystack, needle);
+-  for (;haystack = strchr(haystack, needle[0]); haystack++)
++  for (;(haystack = strchr(haystack, needle[0])); haystack++)
+     if (!strncmp(haystack, needle, len)) return haystack;
+   return 0;
+ }
diff --git a/vdr-tvscraper.spec b/vdr-tvscraper.spec
index 40b2292..ddb95f4 100644
--- a/vdr-tvscraper.spec
+++ b/vdr-tvscraper.spec
@@ -9,14 +9,15 @@
 %endif
 
 Name:           vdr-%{pname}
-Version:        1.1.1
-Release:        2%{?dist}
+Version:        1.1.2
+Release:        1%{?dist}
 Summary:        Collects metadata for all available EPG events
 # The entire source code is GPLv2+ except tools/curlfuncs.* which is BSD (3 clause)
 License:        GPL-2.0-or-later AND MIT
 URL:            https://github.com/MarkusEh/vdr-plugin-tvscraper
 Source0:        %url/archive/refs/tags/v%{version}.tar.gz#/%{pname}-%{version}.tar.gz
-Source1:        vdr-%{pname}.conf
+Source1:        %{name}.conf
+Patch0:         %{name}-f35.patch
 
 BuildRequires:  make
 BuildRequires:  gcc-c++
@@ -48,7 +49,10 @@ Additionally you are invited to contribute to the used web services with
 providing missing data for your favorite movies and series.
 
 %prep
-%autosetup -p0 -n vdr-plugin-%{pname}-%{version}
+%setup -q -n vdr-plugin-%{pname}-%{version}
+%if 0%{?fedora} == 35
+%patch0 -p1
+%endif
 
 %build
 %make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC"
@@ -71,10 +75,15 @@ install -dm 755 %{buildroot}%{vdr_cachedir}/%{pname}
 %attr(-,%{vdr_user},root) %dir %{vdr_cachedir}/%{pname}/
 
 %changelog
+* Thu Aug 11 2022 Martin Gansser <martinkg@fedoraproject.org> - 1.1.2-1
+- Update to 1.1.2-1
+- Add %%{name}-f35.patch
+
 * Tue Aug 09 2022 Martin Gansser <martinkg@fedoraproject.org> - 1.1.1-2
 - Update license tag to "GPL-2.0-or-later AND MIT"
 - Add BR gettext
 
+* Mon Aug 08 2022 Martin Gansser <martinkg@fedoraproject.org> - 1.1.1-2
 - Update to 1.1.1-1
 - Added %%dir %%{vdr_configdir}/plugins/%%{pname} because it's owned by the package
 

From b37915e3bcec6fafb1669de11afacc8878fe31ef Mon Sep 17 00:00:00 2001
From: Martin Gansser <mgansser@online.de>
Date: Sat, 13 Aug 2022 10:01:07 +0200
Subject: [PATCH 02/11] Update to 1.1.3-1

---
 .gitignore         |  1 +
 sources            |  2 +-
 vdr-tvscraper.spec | 11 +++++------
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3f494e3..9d1e85f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /tvscraper-1.1.1.tar.gz
 /tvscraper-1.1.2.tar.gz
+/tvscraper-1.1.3.tar.gz
diff --git a/sources b/sources
index 92fb019..e0d3b55 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tvscraper-1.1.2.tar.gz) = 5f3766cd3548f0eb8e04b5550b68989efc3495e7780f88017f1f8b3c27744a9d414ef81fd4821bebb64113b5e89da526e9ffa74b7e43b71ffcdb992cbcfd3ed5
+SHA512 (tvscraper-1.1.3.tar.gz) = 6e922456f99348739adf6dd28837b84869a990f56f2b445a99740eaccecfdf37cd917d52c8dc39634b210f2a36fd467fd98df5803d9b37563c801146d72d1bcb
diff --git a/vdr-tvscraper.spec b/vdr-tvscraper.spec
index ddb95f4..b35bbcb 100644
--- a/vdr-tvscraper.spec
+++ b/vdr-tvscraper.spec
@@ -9,7 +9,7 @@
 %endif
 
 Name:           vdr-%{pname}
-Version:        1.1.2
+Version:        1.1.3
 Release:        1%{?dist}
 Summary:        Collects metadata for all available EPG events
 # The entire source code is GPLv2+ except tools/curlfuncs.* which is BSD (3 clause)
@@ -17,7 +17,6 @@ License:        GPL-2.0-or-later AND MIT
 URL:            https://github.com/MarkusEh/vdr-plugin-tvscraper
 Source0:        %url/archive/refs/tags/v%{version}.tar.gz#/%{pname}-%{version}.tar.gz
 Source1:        %{name}.conf
-Patch0:         %{name}-f35.patch
 
 BuildRequires:  make
 BuildRequires:  gcc-c++
@@ -49,10 +48,7 @@ Additionally you are invited to contribute to the used web services with
 providing missing data for your favorite movies and series.
 
 %prep
-%setup -q -n vdr-plugin-%{pname}-%{version}
-%if 0%{?fedora} == 35
-%patch0 -p1
-%endif
+%autosetup -p0 -n vdr-plugin-%{pname}-%{version}
 
 %build
 %make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC"
@@ -75,6 +71,9 @@ install -dm 755 %{buildroot}%{vdr_cachedir}/%{pname}
 %attr(-,%{vdr_user},root) %dir %{vdr_cachedir}/%{pname}/
 
 %changelog
+* Sat Aug 13 2022 Martin Gansser <martinkg@fedoraproject.org> - 1.1.3-1
+- Update to 1.1.3-1
+
 * Thu Aug 11 2022 Martin Gansser <martinkg@fedoraproject.org> - 1.1.2-1
 - Update to 1.1.2-1
 - Add %%{name}-f35.patch

From 14a23a745c9b099ad81dfba4dc7f716c454fc14e Mon Sep 17 00:00:00 2001
From: Martin Gansser <mgansser@online.de>
Date: Fri, 19 Aug 2022 10:26:01 +0200
Subject: [PATCH 03/11] Update to 1.1.4-1

---
 .gitignore         | 1 +
 sources            | 2 +-
 vdr-tvscraper.spec | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9d1e85f..90b5b37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /tvscraper-1.1.1.tar.gz
 /tvscraper-1.1.2.tar.gz
 /tvscraper-1.1.3.tar.gz
+/tvscraper-1.1.4.tar.gz
diff --git a/sources b/sources
index e0d3b55..b36d1dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tvscraper-1.1.3.tar.gz) = 6e922456f99348739adf6dd28837b84869a990f56f2b445a99740eaccecfdf37cd917d52c8dc39634b210f2a36fd467fd98df5803d9b37563c801146d72d1bcb
+SHA512 (tvscraper-1.1.4.tar.gz) = 3c726c2b953f26d4e7da9e71d843b40a5e3affb2d2ca9ef3ac5d8b4669f5e058f844a55dbdc346d2a1a1a3110cabecb00df27030c0501d3367a0f4bfba717eff
diff --git a/vdr-tvscraper.spec b/vdr-tvscraper.spec
index b35bbcb..605ed80 100644
--- a/vdr-tvscraper.spec
+++ b/vdr-tvscraper.spec
@@ -9,7 +9,7 @@
 %endif
 
 Name:           vdr-%{pname}
-Version:        1.1.3
+Version:        1.1.4
 Release:        1%{?dist}
 Summary:        Collects metadata for all available EPG events
 # The entire source code is GPLv2+ except tools/curlfuncs.* which is BSD (3 clause)
@@ -71,6 +71,9 @@ install -dm 755 %{buildroot}%{vdr_cachedir}/%{pname}
 %attr(-,%{vdr_user},root) %dir %{vdr_cachedir}/%{pname}/
 
 %changelog
+* Fri Aug 19 2022 Martin Gansser <martinkg@fedoraproject.org> - 1.1.4-1
+- Update to 1.1.4-1
+
 * Sat Aug 13 2022 Martin Gansser <martinkg@fedoraproject.org> - 1.1.3-1
 - Update to 1.1.3-1
 

From 394606aeb9d955b93c3f518e859e8c65f0a409c7 Mon Sep 17 00:00:00 2001
From: Martin Gansser <mgansser@online.de>
Date: Sat, 3 Sep 2022 14:45:28 +0200
Subject: [PATCH 04/11] Update to 1.1.5-1

---
 .gitignore         | 1 +
 sources            | 2 +-
 vdr-tvscraper.spec | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 90b5b37..fff9205 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /tvscraper-1.1.2.tar.gz
 /tvscraper-1.1.3.tar.gz
 /tvscraper-1.1.4.tar.gz
+/tvscraper-1.1.5.tar.gz
diff --git a/sources b/sources
index b36d1dc..ccb7305 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tvscraper-1.1.4.tar.gz) = 3c726c2b953f26d4e7da9e71d843b40a5e3affb2d2ca9ef3ac5d8b4669f5e058f844a55dbdc346d2a1a1a3110cabecb00df27030c0501d3367a0f4bfba717eff
+SHA512 (tvscraper-1.1.5.tar.gz) = a4a65cee5e2f480fc3aaa3c088cfa07c5e0d34b19870bc9fefd8e20dc8949d123e8832e0096c25e25e69c8215bdc666909a7d57e4e2bf1aa22121b7415288c25
diff --git a/vdr-tvscraper.spec b/vdr-tvscraper.spec
index 605ed80..3bae328 100644
--- a/vdr-tvscraper.spec
+++ b/vdr-tvscraper.spec
@@ -9,7 +9,7 @@
 %endif
 
 Name:           vdr-%{pname}
-Version:        1.1.4
+Version:        1.1.5
 Release:        1%{?dist}
 Summary:        Collects metadata for all available EPG events
 # The entire source code is GPLv2+ except tools/curlfuncs.* which is BSD (3 clause)
@@ -71,6 +71,9 @@ install -dm 755 %{buildroot}%{vdr_cachedir}/%{pname}
 %attr(-,%{vdr_user},root) %dir %{vdr_cachedir}/%{pname}/
 
 %changelog
+* Sat Sep 03 2022 Martin Gansser <martinkg@fedoraproject.org> - 1.1.5-1
+- Update to 1.1.5-1
+
 * Fri Aug 19 2022 Martin Gansser <martinkg@fedoraproject.org> - 1.1.4-1
 - Update to 1.1.4-1
 

From b3cbb33eb55cf4c7c04793487f0ea8c60ba6224a Mon Sep 17 00:00:00 2001
From: Martin Gansser <mgansser@online.de>
Date: Sat, 24 Sep 2022 15:47:20 +0200
Subject: [PATCH 05/11] Update to 1.1.6-1

---
 .gitignore         | 1 +
 sources            | 2 +-
 vdr-tvscraper.spec | 9 ++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index fff9205..bf26c29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /tvscraper-1.1.3.tar.gz
 /tvscraper-1.1.4.tar.gz
 /tvscraper-1.1.5.tar.gz
+/tvscraper-1.1.6.tar.gz
diff --git a/sources b/sources
index ccb7305..43838f9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tvscraper-1.1.5.tar.gz) = a4a65cee5e2f480fc3aaa3c088cfa07c5e0d34b19870bc9fefd8e20dc8949d123e8832e0096c25e25e69c8215bdc666909a7d57e4e2bf1aa22121b7415288c25
+SHA512 (tvscraper-1.1.6.tar.gz) = c604b546f4c20b515a8e23c65d39a5af7443856d98bb2371f52c8277e3468254143690799e2750851ffba1519420c808069201f263599133bea9c6beafb510dd
diff --git a/vdr-tvscraper.spec b/vdr-tvscraper.spec
index 3bae328..6bc31f5 100644
--- a/vdr-tvscraper.spec
+++ b/vdr-tvscraper.spec
@@ -9,7 +9,7 @@
 %endif
 
 Name:           vdr-%{pname}
-Version:        1.1.5
+Version:        1.1.6
 Release:        1%{?dist}
 Summary:        Collects metadata for all available EPG events
 # The entire source code is GPLv2+ except tools/curlfuncs.* which is BSD (3 clause)
@@ -23,7 +23,7 @@ BuildRequires:  gcc-c++
 BuildRequires:  gettext
 BuildRequires:  sqlite-devel
 BuildRequires:  libcurl-devel
-BuildRequires:  libxml2-devel
+# BuildRequires:  libxml2-devel
 BuildRequires:  jansson-devel
 BuildRequires:  vdr-devel >= %{vdr_version} 
 Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
@@ -63,7 +63,7 @@ install -dm 755 %{buildroot}%{vdr_cachedir}/%{pname}
 
 %files -f %{name}.lang
 %license COPYING
-%doc HISTORY README
+%doc HISTORY
 %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion}
 %dir %{vdr_configdir}/plugins/%{pname}
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/tvscraper.conf
@@ -71,6 +71,9 @@ install -dm 755 %{buildroot}%{vdr_cachedir}/%{pname}
 %attr(-,%{vdr_user},root) %dir %{vdr_cachedir}/%{pname}/
 
 %changelog
+* Sat Sep 24 2022 Martin Gansser <martinkg@fedoraproject.org> - 1.1.6-1
+- Update to 1.1.6-1
+
 * Sat Sep 03 2022 Martin Gansser <martinkg@fedoraproject.org> - 1.1.5-1
 - Update to 1.1.5-1
 

From 25dfea559f03ef65f65ed99c577fd8bc6817669c Mon Sep 17 00:00:00 2001
From: Martin Gansser <mgansser@online.de>
Date: Sat, 24 Sep 2022 16:14:57 +0200
Subject: [PATCH 06/11] Update to 1.1.6-1

---
 vdr-tvscraper.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vdr-tvscraper.spec b/vdr-tvscraper.spec
index 6bc31f5..3b40cc9 100644
--- a/vdr-tvscraper.spec
+++ b/vdr-tvscraper.spec
@@ -49,6 +49,7 @@ providing missing data for your favorite movies and series.
 
 %prep
 %autosetup -p0 -n vdr-plugin-%{pname}-%{version}
+sed -i -e 's|using namespace std;||' setup.h
 
 %build
 %make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC"
@@ -63,7 +64,7 @@ install -dm 755 %{buildroot}%{vdr_cachedir}/%{pname}
 
 %files -f %{name}.lang
 %license COPYING
-%doc HISTORY
+%doc HISTORY README.md
 %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion}
 %dir %{vdr_configdir}/plugins/%{pname}
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/tvscraper.conf

From e52caf9cfc71e000ce969a979e0c94ddf8e3b3a1 Mon Sep 17 00:00:00 2001
From: Martin Gansser <mgansser@online.de>
Date: Sat, 24 Sep 2022 16:56:09 +0200
Subject: [PATCH 07/11] Update to 1.1.6-1

---
 vdr-markad-ambiguous.patch | 11 +++++++++++
 vdr-tvscraper.spec         |  7 +++----
 2 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 vdr-markad-ambiguous.patch

diff --git a/vdr-markad-ambiguous.patch b/vdr-markad-ambiguous.patch
new file mode 100644
index 0000000..d256704
--- /dev/null
+++ b/vdr-markad-ambiguous.patch
@@ -0,0 +1,11 @@
+--- vdr-plugin-tvscraper-1.1.6/setup.h.orig	2022-09-24 16:49:18.346911892 +0200
++++ vdr-plugin-tvscraper-1.1.6/setup.h	2022-09-24 16:51:19.172530694 +0200
+@@ -20,7 +20,7 @@
+       m_lang_text(lang_text) { m_osdTexts = new const char*[lang_text->size()];}
+     ~langOsd() { delete [] m_osdTexts; }
+     void clear() { m_numLang = 0; m_osdMap.clear(); m_selectedLanguage.clear(); }
+-    void addLanguage(int lang) { m_osdTexts[m_numLang] = getLangText(lang); m_maxOsdTextLength = max(m_maxOsdTextLength, (int)strlen(m_osdTexts[m_numLang])); m_osdMap.insert(m_numLang++, lang); }
++    void addLanguage(int lang) { m_osdTexts[m_numLang] = getLangText(lang); m_maxOsdTextLength = std::max(m_maxOsdTextLength, (int)strlen(m_osdTexts[m_numLang])); m_osdMap.insert(m_numLang++, lang); }
+     void addLine(int currentLanguage) { m_selectedLanguage.push_back(m_osdMap.getFirst(currentLanguage)); }
+     int getLanguage(int line) const { return m_osdMap.getSecond(m_selectedLanguage[line]); }
+     int m_numLang = 0;
diff --git a/vdr-tvscraper.spec b/vdr-tvscraper.spec
index 3b40cc9..d0271ec 100644
--- a/vdr-tvscraper.spec
+++ b/vdr-tvscraper.spec
@@ -16,14 +16,14 @@ Summary:        Collects metadata for all available EPG events
 License:        GPL-2.0-or-later AND MIT
 URL:            https://github.com/MarkusEh/vdr-plugin-tvscraper
 Source0:        %url/archive/refs/tags/v%{version}.tar.gz#/%{pname}-%{version}.tar.gz
-Source1:        %{name}.conf
+Source1:        %{name}.confA
+Patch0:         vdr-markad-ambiguous.patch
 
 BuildRequires:  make
 BuildRequires:  gcc-c++
 BuildRequires:  gettext
 BuildRequires:  sqlite-devel
 BuildRequires:  libcurl-devel
-# BuildRequires:  libxml2-devel
 BuildRequires:  jansson-devel
 BuildRequires:  vdr-devel >= %{vdr_version} 
 Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
@@ -48,8 +48,7 @@ Additionally you are invited to contribute to the used web services with
 providing missing data for your favorite movies and series.
 
 %prep
-%autosetup -p0 -n vdr-plugin-%{pname}-%{version}
-sed -i -e 's|using namespace std;||' setup.h
+%autosetup -p1 -n vdr-plugin-%{pname}-%{version}
 
 %build
 %make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC"

From 151bb70dff7a952a4d19f27b7e1bf074970f1fa7 Mon Sep 17 00:00:00 2001
From: Martin Gansser <mgansser@online.de>
Date: Sat, 24 Sep 2022 16:58:41 +0200
Subject: [PATCH 08/11] Update to 1.1.6-1

---
 vdr-tvscraper.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vdr-tvscraper.spec b/vdr-tvscraper.spec
index d0271ec..32a6fb0 100644
--- a/vdr-tvscraper.spec
+++ b/vdr-tvscraper.spec
@@ -16,7 +16,7 @@ Summary:        Collects metadata for all available EPG events
 License:        GPL-2.0-or-later AND MIT
 URL:            https://github.com/MarkusEh/vdr-plugin-tvscraper
 Source0:        %url/archive/refs/tags/v%{version}.tar.gz#/%{pname}-%{version}.tar.gz
-Source1:        %{name}.confA
+Source1:        %{name}.conf
 Patch0:         vdr-markad-ambiguous.patch
 
 BuildRequires:  make

From 552c2b383d0bffaef0d2124e72b27a4a4cd93042 Mon Sep 17 00:00:00 2001
From: Martin Gansser <mgansser@online.de>
Date: Sat, 24 Sep 2022 17:13:55 +0200
Subject: [PATCH 09/11] Update to 1.1.6-1

---
 vdr-markad-ambiguous.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/vdr-markad-ambiguous.patch b/vdr-markad-ambiguous.patch
index d256704..afedb3b 100644
--- a/vdr-markad-ambiguous.patch
+++ b/vdr-markad-ambiguous.patch
@@ -9,3 +9,16 @@
      void addLine(int currentLanguage) { m_selectedLanguage.push_back(m_osdMap.getFirst(currentLanguage)); }
      int getLanguage(int line) const { return m_osdMap.getSecond(m_selectedLanguage[line]); }
      int m_numLang = 0;
+--- vdr-plugin-tvscraper-1.1.6/setup.c.orig	2022-09-24 17:05:37.130314074 +0200
++++ vdr-plugin-tvscraper-1.1.6/setup.c	2022-09-24 17:08:36.659560910 +0200
+@@ -148,8 +148,8 @@
+ cTVScraperSetup::~cTVScraperSetup() {
+ }
+ void cTVScraperSetup::Setup(void) {
+-    m_NumberOfAdditionalLanguages = max(m_NumberOfAdditionalLanguages, 0);
+-    m_NumberOfAdditionalLanguages = min(m_NumberOfAdditionalLanguages, (int)langAdditional.m_selectedLanguage.size());
++    m_NumberOfAdditionalLanguages = std::max(m_NumberOfAdditionalLanguages, 0);
++    m_NumberOfAdditionalLanguages = std::min(m_NumberOfAdditionalLanguages, (int)langAdditional.m_selectedLanguage.size());
+     int currentItem = Current();
+     Clear();
+     Add(new cOsdItem(tr("Configure channels to be scraped")));

From bc48009a3fce61edf4ef8081ce4bf795d7b32615 Mon Sep 17 00:00:00 2001
From: Martin Gansser <mgansser@online.de>
Date: Wed, 12 Oct 2022 08:49:43 +0200
Subject: [PATCH 10/11] Update to 1.1.7-1

---
 .gitignore                 |   1 +
 sources                    |   2 +-
 vdr-markad-ambiguous.patch |  24 --------
 vdr-tvscraper-f35.patch    | 122 -------------------------------------
 vdr-tvscraper.spec         |   6 +-
 5 files changed, 6 insertions(+), 149 deletions(-)
 delete mode 100644 vdr-markad-ambiguous.patch
 delete mode 100644 vdr-tvscraper-f35.patch

diff --git a/.gitignore b/.gitignore
index bf26c29..8fa1d9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /tvscraper-1.1.4.tar.gz
 /tvscraper-1.1.5.tar.gz
 /tvscraper-1.1.6.tar.gz
+/tvscraper-1.1.7.tar.gz
diff --git a/sources b/sources
index 43838f9..fe16d55 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tvscraper-1.1.6.tar.gz) = c604b546f4c20b515a8e23c65d39a5af7443856d98bb2371f52c8277e3468254143690799e2750851ffba1519420c808069201f263599133bea9c6beafb510dd
+SHA512 (tvscraper-1.1.7.tar.gz) = c516061c60be7701a0c5679032bb51778563467d248fc7b31f1451d49fa735566bead9c51b2d947c42540c1c0c0d2a821b6be987a997d1222dc4377e81ed0cc8
diff --git a/vdr-markad-ambiguous.patch b/vdr-markad-ambiguous.patch
deleted file mode 100644
index afedb3b..0000000
--- a/vdr-markad-ambiguous.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- vdr-plugin-tvscraper-1.1.6/setup.h.orig	2022-09-24 16:49:18.346911892 +0200
-+++ vdr-plugin-tvscraper-1.1.6/setup.h	2022-09-24 16:51:19.172530694 +0200
-@@ -20,7 +20,7 @@
-       m_lang_text(lang_text) { m_osdTexts = new const char*[lang_text->size()];}
-     ~langOsd() { delete [] m_osdTexts; }
-     void clear() { m_numLang = 0; m_osdMap.clear(); m_selectedLanguage.clear(); }
--    void addLanguage(int lang) { m_osdTexts[m_numLang] = getLangText(lang); m_maxOsdTextLength = max(m_maxOsdTextLength, (int)strlen(m_osdTexts[m_numLang])); m_osdMap.insert(m_numLang++, lang); }
-+    void addLanguage(int lang) { m_osdTexts[m_numLang] = getLangText(lang); m_maxOsdTextLength = std::max(m_maxOsdTextLength, (int)strlen(m_osdTexts[m_numLang])); m_osdMap.insert(m_numLang++, lang); }
-     void addLine(int currentLanguage) { m_selectedLanguage.push_back(m_osdMap.getFirst(currentLanguage)); }
-     int getLanguage(int line) const { return m_osdMap.getSecond(m_selectedLanguage[line]); }
-     int m_numLang = 0;
---- vdr-plugin-tvscraper-1.1.6/setup.c.orig	2022-09-24 17:05:37.130314074 +0200
-+++ vdr-plugin-tvscraper-1.1.6/setup.c	2022-09-24 17:08:36.659560910 +0200
-@@ -148,8 +148,8 @@
- cTVScraperSetup::~cTVScraperSetup() {
- }
- void cTVScraperSetup::Setup(void) {
--    m_NumberOfAdditionalLanguages = max(m_NumberOfAdditionalLanguages, 0);
--    m_NumberOfAdditionalLanguages = min(m_NumberOfAdditionalLanguages, (int)langAdditional.m_selectedLanguage.size());
-+    m_NumberOfAdditionalLanguages = std::max(m_NumberOfAdditionalLanguages, 0);
-+    m_NumberOfAdditionalLanguages = std::min(m_NumberOfAdditionalLanguages, (int)langAdditional.m_selectedLanguage.size());
-     int currentItem = Current();
-     Clear();
-     Add(new cOsdItem(tr("Configure channels to be scraped")));
diff --git a/vdr-tvscraper-f35.patch b/vdr-tvscraper-f35.patch
deleted file mode 100644
index 3f87e65..0000000
--- a/vdr-tvscraper-f35.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff -Naur vdr-plugin-tvscraper-1.1.2/autoTimers.c vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/autoTimers.c
---- vdr-plugin-tvscraper-1.1.2/autoTimers.c	2022-08-09 22:28:24.000000000 +0200
-+++ vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/autoTimers.c	2022-08-12 09:15:11.000000000 +0200
-@@ -111,7 +111,11 @@
-     if (season_number == 0 && episode_number == 0) continue; // we look only for recordings we can assign to a specific episode/movie
-     if (season_number == -100) episode_number = 0;
-     bool hd = channelsHD.find((const char *)channelIDs) != channelsHD.end();
-+#if VDRVERSNUM >= 20505
-     int numberOfErrors = rec->Info()->Errors();
-+#else
-+    int numberOfErrors = 0;
-+#endif
-     cScraperRec scraperRec(eventID, eventStartTime, (const char *)channelIDs, rec->Name(), movie_tv_id, season_number, episode_number, hd, numberOfErrors);
-     auto found = recordings.find(scraperRec);
-     if (found == recordings.end() ) recordings.insert(std::move(scraperRec)); // not in list -> insert
-diff -Naur vdr-plugin-tvscraper-1.1.2/images.c vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/images.c
---- vdr-plugin-tvscraper-1.1.2/images.c	2022-08-09 22:28:24.000000000 +0200
-+++ vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/images.c	2022-08-12 09:15:11.000000000 +0200
-@@ -27,7 +27,7 @@
- void cImageLevelsInt::findTopElement() {
-   int t = m_imageLevels;
-   for (m_push = 0; m_push < s_max_levels; m_push++) {
--    if (t & 7 == 0) return;
-+    if ((t & 7) == 0) return;
-     t = t >> 3;
-   }
- }
-@@ -102,7 +102,7 @@
- void cOrientationsInt::findTopElement() {
-   int t = m_orientations;
-   for (m_push = 0; m_push < s_max_orientations; m_push++) {
--    if (t & 7 == 0) return;
-+    if ((t & 7) == 0) return;
-     t = t >> 3;
-   }
- }
-diff -Naur vdr-plugin-tvscraper-1.1.2/searchEventOrRec.c vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/searchEventOrRec.c
---- vdr-plugin-tvscraper-1.1.2/searchEventOrRec.c	2022-08-09 22:28:24.000000000 +0200
-+++ vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/searchEventOrRec.c	2022-08-12 09:15:11.000000000 +0200
-@@ -218,6 +218,7 @@
-     case scrapNone: ; // do nothing, nothing to store
-   }
- }
-+inline void swap(searchResultTvMovie &a, searchResultTvMovie &b) { std::swap(a, b); }
- 
- scrapType cSearchEventOrRec::ScrapFind(vector<searchResultTvMovie> &searchResults, string &movieName, string &episodeSearchString) {
- //  bool debug = m_searchString == "james cameron's dark angel";
-@@ -234,7 +235,7 @@
- // something was found. Add all information which is available for free
-   if (m_baseNameEquShortText) for (searchResultTvMovie &searchResult: searchResults) if (!searchResult.movie() && searchResult.delim() == 0) searchResult.setBaseNameEquShortText();
-   for (searchResultTvMovie &searchResult: searchResults) searchResult.setMatchYear(m_years, m_sEventOrRecording->DurationInSec() );
--  sort(searchResults.begin(), searchResults.end() );
-+  std::sort(searchResults.begin(), searchResults.end() );
-   if (debug) for (searchResultTvMovie &searchResult: searchResults) searchResult.log(m_searchString.c_str() );
-   m_episodeFound = false;
-   std::vector<searchResultTvMovie>::iterator new_end;
-@@ -436,7 +437,7 @@
- 
- // look for matches of part of the actor
-   const char *lPos = actor.c_str();
--  for (const char *rDelimPos; rDelimPos = strchr(lPos, ' '); lPos = rDelimPos + 1)
-+  for (const char *rDelimPos; (rDelimPos = strchr(lPos, ' ')); lPos = rDelimPos + 1)
-     addActor(description, lPos, rDelimPos - lPos, numMatchesFirst, alreadyFound);
-   addActor(description, lPos, 0, numMatchesSure, alreadyFound);
- }
-@@ -516,7 +517,7 @@
- // minDiff must be > 0, otherwise an empty list my be returned
- //  bool debug = m_searchString == "james cameron's dark angel";
-   bool debug = false;
--  float minDiffSame = max (minDiff - 0.05, 0.01);
-+  float minDiffSame = std::max(minDiff - 0.05, 0.01);
-   float minDiffOther = minDiff;
-   new_end = end;
-   if (begin == end) return false; // empty list
-diff -Naur vdr-plugin-tvscraper-1.1.2/themoviedbscraper/moviedbmovie.c vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/themoviedbscraper/moviedbmovie.c
---- vdr-plugin-tvscraper-1.1.2/themoviedbscraper/moviedbmovie.c	2022-08-09 22:28:24.000000000 +0200
-+++ vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/themoviedbscraper/moviedbmovie.c	2022-08-12 09:15:11.000000000 +0200
-@@ -177,7 +177,7 @@
- 
-         searchResultTvMovie sRes(id, true, json_string_value_validated(result, "release_date") );
-         sRes.setPositionInExternalResult(resultSet.size() );
--        sRes.setMatchText(min(sentence_distance(resultTitle, SearchString), sentence_distance(resultOriginalTitle, SearchString) ) );
-+        sRes.setMatchText(std::min(sentence_distance(resultTitle, SearchString), sentence_distance(resultOriginalTitle, SearchString) ) );
-         sRes.setPopularity(json_number_value_validated(result, "popularity"), json_number_value_validated(result, "vote_average"), json_integer_value_validated(result, "vote_count") );
-         resultSet.push_back(sRes);
-     }
-diff -Naur vdr-plugin-tvscraper-1.1.2/themoviedbscraper/moviedbtv.c vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/themoviedbscraper/moviedbtv.c
---- vdr-plugin-tvscraper-1.1.2/themoviedbscraper/moviedbtv.c	2022-08-09 22:28:24.000000000 +0200
-+++ vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/themoviedbscraper/moviedbtv.c	2022-08-12 09:15:11.000000000 +0200
-@@ -131,7 +131,7 @@
- 
-             searchResultTvMovie sRes(id, false, json_string_value_validated(result, "release_date") );
-             sRes.setPositionInExternalResult(resultSet.size() );
--            sRes.setMatchText(min(sentence_distance(resultName, tvSearchString), sentence_distance(resultOriginalName, tvSearchString) )  + 1); // avaid this, prefer TVDB
-+            sRes.setMatchText(std::min(sentence_distance(resultName, tvSearchString), sentence_distance(resultOriginalName, tvSearchString) )  + 1); // avaid this, prefer TVDB
-             sRes.setPopularity(json_number_value_validated(result, "popularity"), json_number_value_validated(result, "vote_average"), json_integer_value_validated(result, "vote_count") );
-             resultSet.push_back(sRes);
-         }
-diff -Naur vdr-plugin-tvscraper-1.1.2/thetvdbscraper/tvdbseries.c vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/thetvdbscraper/tvdbseries.c
---- vdr-plugin-tvscraper-1.1.2/thetvdbscraper/tvdbseries.c	2022-08-09 22:28:24.000000000 +0200
-+++ vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/thetvdbscraper/tvdbseries.c	2022-08-12 09:15:11.000000000 +0200
-@@ -73,7 +73,7 @@
-     int dist_a = sentence_distance(name, SearchString);
-     if (debug) esyslog("tvscraper: series SearchString %s, name %s, distance %i", SearchString.c_str(), name.c_str(), dist_a);
- // (2013) or similar at the end of a name in thetvdb indicates a year. This year is not given in the EPG. 
--    if (StringRemoveLastPartWithP(name) ) dist_a = min(dist_a, sentence_distance(name, SearchString) );
-+    if (StringRemoveLastPartWithP(name) ) dist_a = std::min(dist_a, sentence_distance(name, SearchString) );
-     std::size_t lDelim = aliasNames.find('|');
-     if (lDelim !=std::string::npos) {
-       for (std::size_t rDelim = aliasNames.find('|', lDelim +1); rDelim != std::string::npos; rDelim = aliasNames.find('|', lDelim +1) ) {
-diff -Naur vdr-plugin-tvscraper-1.1.2/tools/stringhelpers.c vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/tools/stringhelpers.c
---- vdr-plugin-tvscraper-1.1.2/tools/stringhelpers.c	2022-08-09 22:28:24.000000000 +0200
-+++ vdr-plugin-tvscraper-085bb522695050b611d1792f1dbf11345d065641/tools/stringhelpers.c	2022-08-12 09:15:11.000000000 +0200
-@@ -52,7 +52,7 @@
- // if len == 0: use strlen(needle) characters of needle
- 
-   if (len == 0) return strstr(haystack, needle);
--  for (;haystack = strchr(haystack, needle[0]); haystack++)
-+  for (;(haystack = strchr(haystack, needle[0])); haystack++)
-     if (!strncmp(haystack, needle, len)) return haystack;
-   return 0;
- }
diff --git a/vdr-tvscraper.spec b/vdr-tvscraper.spec
index 32a6fb0..cd02d8a 100644
--- a/vdr-tvscraper.spec
+++ b/vdr-tvscraper.spec
@@ -9,7 +9,7 @@
 %endif
 
 Name:           vdr-%{pname}
-Version:        1.1.6
+Version:        1.1.7
 Release:        1%{?dist}
 Summary:        Collects metadata for all available EPG events
 # The entire source code is GPLv2+ except tools/curlfuncs.* which is BSD (3 clause)
@@ -17,7 +17,6 @@ License:        GPL-2.0-or-later AND MIT
 URL:            https://github.com/MarkusEh/vdr-plugin-tvscraper
 Source0:        %url/archive/refs/tags/v%{version}.tar.gz#/%{pname}-%{version}.tar.gz
 Source1:        %{name}.conf
-Patch0:         vdr-markad-ambiguous.patch
 
 BuildRequires:  make
 BuildRequires:  gcc-c++
@@ -71,6 +70,9 @@ install -dm 755 %{buildroot}%{vdr_cachedir}/%{pname}
 %attr(-,%{vdr_user},root) %dir %{vdr_cachedir}/%{pname}/
 
 %changelog
+* Wed Oct 12 2022 Martin Gansser <martinkg@fedoraproject.org> - 1.1.7-1
+- Update to 1.1.7-1
+
 * Sat Sep 24 2022 Martin Gansser <martinkg@fedoraproject.org> - 1.1.6-1
 - Update to 1.1.6-1
 

From 139209f56c0ff4d8b53a85f8e7eccd44cbae2f6e Mon Sep 17 00:00:00 2001
From: Martin Gansser <mgansser@online.de>
Date: Fri, 28 Oct 2022 09:39:14 +0200
Subject: [PATCH 11/11] Update to 1.1.8-1

---
 .gitignore         | 1 +
 sources            | 2 +-
 vdr-tvscraper.spec | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8fa1d9f..47706b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /tvscraper-1.1.5.tar.gz
 /tvscraper-1.1.6.tar.gz
 /tvscraper-1.1.7.tar.gz
+/tvscraper-1.1.8.tar.gz
diff --git a/sources b/sources
index fe16d55..eaec34d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tvscraper-1.1.7.tar.gz) = c516061c60be7701a0c5679032bb51778563467d248fc7b31f1451d49fa735566bead9c51b2d947c42540c1c0c0d2a821b6be987a997d1222dc4377e81ed0cc8
+SHA512 (tvscraper-1.1.8.tar.gz) = f32e999028506a1c70c0cddc301113f88c9695a2c170d22bcc24b780d4b49744d823375da5f3127e516ac33611761a748e510841dcb0b9ad4a61464bc2df717e
diff --git a/vdr-tvscraper.spec b/vdr-tvscraper.spec
index cd02d8a..c717b36 100644
--- a/vdr-tvscraper.spec
+++ b/vdr-tvscraper.spec
@@ -9,7 +9,7 @@
 %endif
 
 Name:           vdr-%{pname}
-Version:        1.1.7
+Version:        1.1.8
 Release:        1%{?dist}
 Summary:        Collects metadata for all available EPG events
 # The entire source code is GPLv2+ except tools/curlfuncs.* which is BSD (3 clause)
@@ -70,6 +70,9 @@ install -dm 755 %{buildroot}%{vdr_cachedir}/%{pname}
 %attr(-,%{vdr_user},root) %dir %{vdr_cachedir}/%{pname}/
 
 %changelog
+* Fri Oct 28 2022 Martin Gansser <martinkg@fedoraproject.org> - 1.1.8-1
+- Update to 1.1.8-1
+
 * Wed Oct 12 2022 Martin Gansser <martinkg@fedoraproject.org> - 1.1.7-1
 - Update to 1.1.7-1