diff --git a/.gitignore b/.gitignore index 0328ce4..d161468 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,3 @@ /vdr-scraper2vdr-1.1.0.tar.gz /vdr-scraper2vdr-1.1.1.tar.gz /vdr-scraper2vdr-1.1.2.tar.gz -/vdr-scraper2vdr-1.1.3.tar.gz diff --git a/scraper2vdr_serienposter_statt_banner.diff b/scraper2vdr_serienposter_statt_banner.diff index 74ecd30..393c273 100644 --- a/scraper2vdr_serienposter_statt_banner.diff +++ b/scraper2vdr_serienposter_statt_banner.diff @@ -1,5 +1,5 @@ ---- a/scrapmanager.c 2020-12-28 18:38:53.850634334 +0100 -+++ b/scrapmanager.c.new 2020-12-28 18:44:09.536615518 +0100 +--- 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; diff --git a/sources b/sources index cfed4eb..c03fc26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-scraper2vdr-1.1.3.tar.gz) = a634074df8da023ece31b73c71e0da6b769662e7859d248e08ac06d6d9543317ff8ebe4e343c289092622fbdb5613ff4002ec3c97d6bca6c8e2a0c267f6432dc +SHA512 (vdr-scraper2vdr-1.1.2.tar.gz) = ddb6e27e9e2285083d9fc7622b6277d24430f141cf1deff91c66da5a2e4e879a7a4892bea99474e5d328377b9984b0f5132765fb7e83cc0c3e63ff65a91f3f64 diff --git a/vdr-scraper2vdr-EventID.patch b/vdr-scraper2vdr-EventID.patch deleted file mode 100644 index c477bf6..0000000 --- a/vdr-scraper2vdr-EventID.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- scraper2vdr-1.1.2/scrapmanager.c.orig 2024-09-30 17:53:05.670275247 +0200 -+++ scraper2vdr-1.1.2/scrapmanager.c 2024-09-30 17:54:52.250414105 +0200 -@@ -441,7 +441,7 @@ - const cSchedule *schedule = schedules->GetSchedule(cID); - - if (schedule) -- event = schedule->GetEvent(key.eventId); -+ event = schedule->GetEventById(key.eventId); - } - - if (event) -@@ -497,7 +497,7 @@ - const cSchedule *schedule = schedules->GetSchedule(cID); - - if (schedule) -- event = schedule->GetEvent(key.eventId); -+ event = schedule->GetEventById(key.eventId); - } - - if (event) diff --git a/vdr-scraper2vdr.spec b/vdr-scraper2vdr.spec index 7aade7a..58ed60f 100644 --- a/vdr-scraper2vdr.spec +++ b/vdr-scraper2vdr.spec @@ -1,24 +1,22 @@ # https://github.com/horchi/scraper2vdr/commit/d9f6cb454ebbc951af5d1a4aa7fcc31e772f3bca %global commit0 d9f6cb454ebbc951af5d1a4aa7fcc31e772f3bca %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) + %global pname scraper2vdr %global gitdate 20190128 -# Set vdr_version based on Fedora version -%if 0%{?fedora} >= 43 -%global vdr_version 2.7.7 -%elif 0%{?fedora} == 42 -%global vdr_version 2.7.4 -%else -%global vdr_version 2.6.9 +# version we want build against +%global vdr_version 2.6.1 +%if 0%{?fedora} >= 38 +%global vdr_version 2.6.3 %endif Name: vdr-scraper2vdr -Version: 1.1.3 +Version: 1.1.2 #Release: 15.%%{gitdate}git%%{shortcommit0}%%{?dist} -Release: 15%{?dist} +Release: 2%{?dist} Summary: A client plugin which provides scraped metadata from EPGD to other plugins -License: GPL-1.0-or-later +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/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -28,7 +26,6 @@ Patch0: scraper2vdr_serienposter_statt_banner.diff BuildRequires: make BuildRequires: gcc-c++ -BuildRequires: gettext BuildRequires: libuuid-devel BuildRequires: pkgconfig(GraphicsMagick++) BuildRequires: openssl-devel @@ -50,7 +47,7 @@ the terms of use. %prep #%%autosetup -p0 -n %%{pname}-%%{commit0} -%autosetup -p1 -n %{pname}-%{version} +%autosetup -p0 -n %{pname}-%{version} iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README # fedora specific @@ -76,53 +73,6 @@ install -Dpm 644 %{SOURCE1} \ %config(noreplace) %{vdr_configdir}/plugins/%{pname}/epg.dat %changelog -* Fri Jul 25 2025 Martin Gansser - 1.1.3-15 -- Rebuilt for new VDR API version 2.7.7 - -* Fri Jul 25 2025 Fedora Release Engineering - 1.1.3-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jun 21 2025 Martin Gansser - 1.1.3-13 -- Rebuilt for new VDR API version 2.7.6 - -* Tue May 27 2025 Martin Gansser - 1.1.3-12 -- Rebuilt for new VDR API version 2.7.5 - -* Fri Feb 28 2025 Martin Gansser - 1.1.3-11 -- Rebuilt for new VDR API version 2.7.4 - -* Fri Feb 14 2025 Martin Gansser - 1.1.3-1 -- Update to 1.1.3 - -* Sun Jan 19 2025 Fedora Release Engineering - 1.1.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Oct 09 2024 Martin Gansser - 1.1.2-10 -- Rebuilt for new VDR API version 2.7.2 -- Add vdr-scraper2vdr-EventID.patch for vdr-2.7.x - -* Sat Jul 20 2024 Fedora Release Engineering - 1.1.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jul 15 2024 Martin Gansser - 1.1.2-8 -- Rebuilt for new VDR API version 2.6.9 - -* Thu Jul 11 2024 Martin Gansser - 1.1.2-7 -- Rebuilt for new VDR API version 2.6.8 - -* Mon Jun 17 2024 Miroslav Suchý - 1.1.2-6 -- convert license to SPDX - -* Fri Apr 12 2024 Martin Gansser - 1.1.2-5 -- Rebuilt for new VDR API version - -* Fri Jan 26 2024 Martin Gansser - 1.1.2-4 -- Rebuilt for new VDR API version - -* Fri Jan 05 2024 Martin Gansser - 1.1.2-3 -- Rebuilt for new VDR API version -- Add BR gettext for rawhide - * Sat Jul 22 2023 Fedora Release Engineering - 1.1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild