From ef2492b92ba802b1e32a2cb66a472f19ddfa9046 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:27:04 +0000 Subject: [PATCH 01/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-epgfixer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index a5488ed..af3e7cf 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.3.1 -Release: 7.%{gitdate}git%{shortcommit}%{?dist} +Release: 8.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ @@ -59,6 +59,9 @@ install -Dpm 644 %{SOURCE1} \ %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0.3.1-8.20180416git354f28b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Apr 26 2018 Martin Gansser - 0.3.1-7.20180416git354f28b - Update to 0.3.1-7.20180416git354f28b - Rebuilt for vdr-2.4.0 From 0c3045b45a54dde7238bf71519d6ea06c73630db Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 19 Jul 2018 20:56:42 +0200 Subject: [PATCH 02/40] add BuildRequires: gcc-c++ Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- vdr-epgfixer.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index af3e7cf..37912d5 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -19,6 +19,7 @@ Patch0: 0001-Fix-replacing-at-the-end-of-string-when-using-s-.-Fi.patch # https://projects.vdr-developer.org/git/vdr-plugin-epgfixer.git/commit/?id=16d0db40d37706c79c7e911aebcdd344200a4725 Patch1: 0001-Fix-LoadConfigFile-return-value-on-success.patch +BuildRequires: gcc-c++ BuildRequires: vdr-devel >= 1.7.26 BuildRequires: pcre-devel Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} From 3dbcc701ad55d1115350f5915e86b059b6c8ba6f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:08:54 +0000 Subject: [PATCH 03/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-epgfixer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index 37912d5..4cf81e3 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.3.1 -Release: 8.%{gitdate}git%{shortcommit}%{?dist} +Release: 9.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ @@ -60,6 +60,9 @@ install -Dpm 644 %{SOURCE1} \ %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 0.3.1-9.20180416git354f28b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 0.3.1-8.20180416git354f28b - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From b2300863e70036cbbce66011b5b193e2f6e442f8 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 20 Jun 2019 19:02:58 +0200 Subject: [PATCH 04/40] Rebuilt for new VDR API version --- vdr-epgfixer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index 4cf81e3..ead099e 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.3.1 -Release: 9.%{gitdate}git%{shortcommit}%{?dist} +Release: 10.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ @@ -60,6 +60,9 @@ install -Dpm 644 %{SOURCE1} \ %changelog +* Tue Jun 19 2019 Martin Gansser - 0.3.1-10.20180416git354f28b +- Rebuilt for new VDR API version + * Sun Feb 03 2019 Fedora Release Engineering - 0.3.1-9.20180416git354f28b - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 390658f3ba27423df4bbb3144f82191041b0a45f Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 20 Jun 2019 19:08:07 +0200 Subject: [PATCH 05/40] Rebuilt for new VDR API version --- vdr-epgfixer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index ead099e..6e554d8 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -60,7 +60,7 @@ install -Dpm 644 %{SOURCE1} \ %changelog -* Tue Jun 19 2019 Martin Gansser - 0.3.1-10.20180416git354f28b +* Wed Jun 19 2019 Martin Gansser - 0.3.1-10.20180416git354f28b - Rebuilt for new VDR API version * Sun Feb 03 2019 Fedora Release Engineering - 0.3.1-9.20180416git354f28b From f14810bf7828f0edd0bb769510f1eb8b9d08ff6e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:50:38 +0000 Subject: [PATCH 06/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-epgfixer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index 6e554d8..18d27e4 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.3.1 -Release: 10.%{gitdate}git%{shortcommit}%{?dist} +Release: 11.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ @@ -60,6 +60,9 @@ install -Dpm 644 %{SOURCE1} \ %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0.3.1-11.20180416git354f28b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Wed Jun 19 2019 Martin Gansser - 0.3.1-10.20180416git354f28b - Rebuilt for new VDR API version From d52005071b539d68c2bcd33bdf5d041f993c673f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 02:59:40 +0000 Subject: [PATCH 07/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-epgfixer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index 18d27e4..c845de8 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.3.1 -Release: 11.%{gitdate}git%{shortcommit}%{?dist} +Release: 12.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ @@ -60,6 +60,9 @@ install -Dpm 644 %{SOURCE1} \ %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 0.3.1-12.20180416git354f28b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 0.3.1-11.20180416git354f28b - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From ca19213578c1736b0a4065b841583cb74e2e19e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:35:29 +0000 Subject: [PATCH 08/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-epgfixer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index c845de8..8e75707 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.3.1 -Release: 12.%{gitdate}git%{shortcommit}%{?dist} +Release: 13.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ @@ -60,6 +60,9 @@ install -Dpm 644 %{SOURCE1} \ %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.3.1-13.20180416git354f28b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 0.3.1-12.20180416git354f28b - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 24ec4eaa1034dc56e9630924485073770c0eabfb Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 28 Aug 2020 13:48:58 +0200 Subject: [PATCH 09/40] Rebuilt for new VDR API version --- vdr-epgfixer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index 8e75707..241eb99 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.3.1 -Release: 13.%{gitdate}git%{shortcommit}%{?dist} +Release: 14.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ @@ -60,6 +60,9 @@ install -Dpm 644 %{SOURCE1} \ %changelog +* Fri Aug 28 2020 Martin Gansser - 0.3.1-14.20180416git354f28b +- Rebuilt for new VDR API version + * Wed Jul 29 2020 Fedora Release Engineering - 0.3.1-13.20180416git354f28b - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 07edc75fb022340b6c0f1e37cc44e9ab0df304ea Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 3 Jan 2021 17:17:39 +0100 Subject: [PATCH 10/40] Rebuilt for new VDR API version --- vdr-epgfixer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index 241eb99..ae5c248 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.3.1 -Release: 14.%{gitdate}git%{shortcommit}%{?dist} +Release: 15.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ @@ -60,6 +60,9 @@ install -Dpm 644 %{SOURCE1} \ %changelog +* Sun Jan 03 2021 Martin Gansser - 0.3.1-15.20180416git354f28b +- Rebuilt for new VDR API version + * Fri Aug 28 2020 Martin Gansser - 0.3.1-14.20180416git354f28b - Rebuilt for new VDR API version From 859cf7ae3ce85e7562a84577290f0bdd9359d3aa Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:36:59 +0000 Subject: [PATCH 11/40] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- vdr-epgfixer.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index ae5c248..62edcdc 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -19,6 +19,7 @@ Patch0: 0001-Fix-replacing-at-the-end-of-string-when-using-s-.-Fi.patch # https://projects.vdr-developer.org/git/vdr-plugin-epgfixer.git/commit/?id=16d0db40d37706c79c7e911aebcdd344200a4725 Patch1: 0001-Fix-LoadConfigFile-return-value-on-success.patch +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: vdr-devel >= 1.7.26 BuildRequires: pcre-devel From 5f37a038d6f4636b4c721452995c3e4d796df1a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:57:08 +0000 Subject: [PATCH 12/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-epgfixer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index 62edcdc..d51324f 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.3.1 -Release: 15.%{gitdate}git%{shortcommit}%{?dist} +Release: 16.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ @@ -61,6 +61,9 @@ install -Dpm 644 %{SOURCE1} \ %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 0.3.1-16.20180416git354f28b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sun Jan 03 2021 Martin Gansser - 0.3.1-15.20180416git354f28b - Rebuilt for new VDR API version From b3764470ab13bb12a10b5028c5d494dc620a8982 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 28 Apr 2021 09:46:01 +0200 Subject: [PATCH 13/40] Rebuilt for new VDR API version --- vdr-epgfixer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index d51324f..91011d2 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.3.1 -Release: 16.%{gitdate}git%{shortcommit}%{?dist} +Release: 17.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ @@ -61,6 +61,9 @@ install -Dpm 644 %{SOURCE1} \ %changelog +* Wed Apr 28 2021 Martin Gansser - 0.3.1-17.20180416git354f28b +- Rebuilt for new VDR API version + * Wed Jan 27 2021 Fedora Release Engineering - 0.3.1-16.20180416git354f28b - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 36570eb2ec47f423af2e8796f51368a1a0ca2d2d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:20:36 +0000 Subject: [PATCH 14/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-epgfixer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index 91011d2..426f04e 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.3.1 -Release: 17.%{gitdate}git%{shortcommit}%{?dist} +Release: 18.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ @@ -61,6 +61,9 @@ install -Dpm 644 %{SOURCE1} \ %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.3.1-18.20180416git354f28b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Apr 28 2021 Martin Gansser - 0.3.1-17.20180416git354f28b - Rebuilt for new VDR API version From 014cfe6455f83238a720101516799cb009118120 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 30 Dec 2021 16:58:51 +0100 Subject: [PATCH 15/40] Rebuilt for new VDR API version --- vdr-epgfixer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index 426f04e..bf8ff9b 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.3.1 -Release: 18.%{gitdate}git%{shortcommit}%{?dist} +Release: 19.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ @@ -61,6 +61,9 @@ install -Dpm 644 %{SOURCE1} \ %changelog +* Thu Dec 30 2021 Martin Gansser - 0.3.1-19.20180416git354f28b +- Rebuilt for new VDR API version + * Fri Jul 23 2021 Fedora Release Engineering - 0.3.1-18.20180416git354f28b - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 4b41590120fc5f6489154acde70c0df4678d52bd Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 30 Dec 2021 17:14:31 +0100 Subject: [PATCH 16/40] Rebuilt for new VDR API version --- ...adConfigFile-return-value-on-success.patch | 24 ----- ...-the-end-of-string-when-using-s-.-Fi.patch | 99 ------------------- vdr-epgfixer.spec | 16 +-- 3 files changed, 4 insertions(+), 135 deletions(-) delete mode 100644 0001-Fix-LoadConfigFile-return-value-on-success.patch delete mode 100644 0001-Fix-replacing-at-the-end-of-string-when-using-s-.-Fi.patch diff --git a/0001-Fix-LoadConfigFile-return-value-on-success.patch b/0001-Fix-LoadConfigFile-return-value-on-success.patch deleted file mode 100644 index 17b7172..0000000 --- a/0001-Fix-LoadConfigFile-return-value-on-success.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 1df04e59273606117bd7a19559dd26da26844962 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Skytt=C3=A4?= -Date: Wed, 3 Apr 2013 19:11:10 +0300 -Subject: [PATCH] Fix LoadConfigFile() return value on success. - ---- - tools.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools.h b/tools.h -index 119d32d..9dda805 100644 ---- a/tools.h -+++ b/tools.h -@@ -94,6 +94,7 @@ template bool cEpgfixerList -Date: Sun, 2 Dec 2012 18:03:29 +0200 -Subject: [PATCH] Fix replacing at the end of string when using s///. Fix - variable name clash. - ---- - regexp.c | 28 ++++++++++++++-------------- - 1 file changed, 14 insertions(+), 14 deletions(-) - -diff --git a/regexp.c b/regexp.c -index 4631cbd..8392586 100644 ---- a/regexp.c -+++ b/regexp.c -@@ -221,7 +221,7 @@ bool cRegexp::Apply(cEvent *Event) - start_offset = ovector[1]; - } - // replace EPG field if regexp matched -- if (last_match_end > 0 && (last_match_end < tmpstringlen - 1)) { -+ if (last_match_end > 0 && (last_match_end <= tmpstringlen)) { - resultstring = cString::sprintf("%s%s", *resultstring, tmpstring + last_match_end); - switch (source) { - case REGEXP_TITLE: -@@ -240,7 +240,7 @@ bool cRegexp::Apply(cEvent *Event) - } - } - else {// use backreferences -- const char *string; -+ const char *capturestring; - rc = pcre_exec(re, sd, *tmpstring, strlen(*tmpstring), 0, 0, ovector, OVECCOUNT); - if (rc == 0) { - error("maximum number of captured substrings is %d\n", OVECCOUNT / 3 - 1); -@@ -250,51 +250,51 @@ bool cRegexp::Apply(cEvent *Event) - // loop through all possible backreferences - // TODO allow duplicate backreference names? - while (i < 10) { -- if (pcre_get_named_substring(re, tmpstring, ovector, rc, strBackrefs[i], &string) != PCRE_ERROR_NOSUBSTRING) { -+ if (pcre_get_named_substring(re, tmpstring, ovector, rc, strBackrefs[i], &capturestring) != PCRE_ERROR_NOSUBSTRING) { - switch (i) { - case ATITLE: - case PTITLE: - if (Event->Title()) { - if (i == ATITLE) -- Event->SetTitle(*cString::sprintf("%s %s", Event->Title(), string)); -+ Event->SetTitle(*cString::sprintf("%s %s", Event->Title(), capturestring)); - else -- Event->SetTitle(*cString::sprintf("%s %s", string, Event->Title())); -+ Event->SetTitle(*cString::sprintf("%s %s", capturestring, Event->Title())); - break; - } - case TITLE: -- Event->SetTitle(string); -+ Event->SetTitle(capturestring); - break; - case ASHORTTEXT: - case PSHORTTEXT: - if (Event->ShortText()) { - if (i == ASHORTTEXT) -- Event->SetShortText(*cString::sprintf("%s %s", Event->ShortText(), string)); -+ Event->SetShortText(*cString::sprintf("%s %s", Event->ShortText(), capturestring)); - else -- Event->SetShortText(*cString::sprintf("%s %s", string, Event->ShortText())); -+ Event->SetShortText(*cString::sprintf("%s %s", capturestring, Event->ShortText())); - break; - } - case SHORTTEXT: -- Event->SetShortText(string); -+ Event->SetShortText(capturestring); - break; - case ADESCRIPTION: - case PDESCRIPTION: - if (Event->Description()) { - if (i == ADESCRIPTION) -- Event->SetDescription(*cString::sprintf("%s %s", Event->Description(), string)); -+ Event->SetDescription(*cString::sprintf("%s %s", Event->Description(), capturestring)); - else -- Event->SetDescription(*cString::sprintf("%s %s", string, Event->Description())); -+ Event->SetDescription(*cString::sprintf("%s %s", capturestring, Event->Description())); - break; - } - case DESCRIPTION: -- Event->SetDescription(string); -+ Event->SetDescription(capturestring); - break; - case RATING: -- Event->SetParentalRating(atoi(string)); -+ Event->SetParentalRating(atoi(capturestring)); - break; - default: - break; - } -- pcre_free_substring(string); -+ pcre_free_substring(capturestring); - } - ++i; - } --- -1.9.0 - diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index bf8ff9b..a0d7430 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -12,14 +12,9 @@ Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ URL: https://projects.vdr-developer.org/projects/plg-epgfixer Source0: https://projects.vdr-developer.org/git/vdr-plugin-epgfixer.git/snapshot/vdr-plugin-epgfixer-%{commit}.tar.bz2 - Source1: %{name}.conf -# https://projects.vdr-developer.org/git/vdr-plugin-epgfixer.git/commit/?id=2b099cc01701e784fa5b1c53f38fd592b0b3ae42 -Patch0: 0001-Fix-replacing-at-the-end-of-string-when-using-s-.-Fi.patch -# https://projects.vdr-developer.org/git/vdr-plugin-epgfixer.git/commit/?id=16d0db40d37706c79c7e911aebcdd344200a4725 -Patch1: 0001-Fix-LoadConfigFile-return-value-on-success.patch -BuildRequires: make +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: vdr-devel >= 1.7.26 BuildRequires: pcre-devel @@ -31,22 +26,20 @@ include modifying EPG data using regular expressions, character set conversions, blacklists, cloning EPG data, removing HTML tags, and editing all settings through setup menu. - %prep -%setup -q -n vdr-plugin-%{pname}-%{commit} - +%autosetup -p1 -n vdr-plugin-%{pname}-%{commit} %build -make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %{?_smp_mflags} \ +%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" \ LIBDIR=. LOCALEDIR=./locale VDRDIR=%{_libdir}/vdr - %install install -dm 755 $RPM_BUILD_ROOT%{vdr_configdir}/plugins/%{pname} install -pm 644 epgfixer/{blacklist,charset,epgclone,regexp}.conf \ $RPM_BUILD_ROOT%{vdr_configdir}/plugins/%{pname} install -Dpm 644 %{SOURCE1} \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf + %make_install %find_lang %{name} @@ -59,7 +52,6 @@ install -Dpm 644 %{SOURCE1} \ %config(noreplace) %{vdr_configdir}/plugins/%{pname}/ %defattr(-,root,root,-) - %changelog * Thu Dec 30 2021 Martin Gansser - 0.3.1-19.20180416git354f28b - Rebuilt for new VDR API version From f7d384928a0e330bea6d5edbdf2b877bb7799092 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:50:43 +0000 Subject: [PATCH 17/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-epgfixer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index a0d7430..3222f3f 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.3.1 -Release: 19.%{gitdate}git%{shortcommit}%{?dist} +Release: 20.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ @@ -53,6 +53,9 @@ install -Dpm 644 %{SOURCE1} \ %defattr(-,root,root,-) %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.3.1-20.20180416git354f28b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Dec 30 2021 Martin Gansser - 0.3.1-19.20180416git354f28b - Rebuilt for new VDR API version From 415a5e16d8b51a67029c10c8007b5e69295da803 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 4 Feb 2022 14:07:10 +0100 Subject: [PATCH 18/40] Rebuilt for new VDR API version --- vdr-epgfixer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index 3222f3f..56ad92c 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.3.1 -Release: 20.%{gitdate}git%{shortcommit}%{?dist} +Release: 21.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ @@ -53,6 +53,9 @@ install -Dpm 644 %{SOURCE1} \ %defattr(-,root,root,-) %changelog +* Fri Feb 04 2022 Martin Gansser - 0.3.1-21.20180416git354f28b +- Rebuilt for new VDR API version + * Sat Jan 22 2022 Fedora Release Engineering - 0.3.1-20.20180416git354f28b - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 91e03cd650554b762a8a902f3d210b3e405999c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:44:32 +0000 Subject: [PATCH 19/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-epgfixer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index 56ad92c..9f0a961 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -6,7 +6,7 @@ Name: vdr-%{pname} Version: 0.3.1 -Release: 21.%{gitdate}git%{shortcommit}%{?dist} +Release: 22.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ @@ -53,6 +53,9 @@ install -Dpm 644 %{SOURCE1} \ %defattr(-,root,root,-) %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.3.1-22.20180416git354f28b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Feb 04 2022 Martin Gansser - 0.3.1-21.20180416git354f28b - Rebuilt for new VDR API version From fc4be0e8f9bf64e123b1ae3de2bdb2e22b4f2937 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 1 Dec 2022 17:18:17 +0100 Subject: [PATCH 20/40] Rebuilt for new VDR API version --- vdr-epgfixer.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index 9f0a961..91cef6b 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -3,10 +3,15 @@ %global commit 354f28b0112ba27f08f6509243b410899f74b6ed %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global gitdate 20180416 +# version we want build against +%global vdr_version 2.6.1 +%if 0%{?fedora} >= 38 +%global vdr_version 2.6.2 +%endif Name: vdr-%{pname} Version: 0.3.1 -Release: 22.%{gitdate}git%{shortcommit}%{?dist} +Release: 23.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ @@ -16,7 +21,7 @@ Source1: %{name}.conf BuildRequires: make BuildRequires: gcc-c++ -BuildRequires: vdr-devel >= 1.7.26 +BuildRequires: vdr-devel >= %{vdr_version} BuildRequires: pcre-devel Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} @@ -53,6 +58,9 @@ install -Dpm 644 %{SOURCE1} \ %defattr(-,root,root,-) %changelog +* Thu Dec 01 2022 Martin Gansser - 0.3.1-23.20180416git354f28b +- Rebuilt for new VDR API version + * Sat Jul 23 2022 Fedora Release Engineering - 0.3.1-22.20180416git354f28b - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 7b21972c2be20dc8206057963f991b82d1474285 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 14 Dec 2022 16:08:00 +0100 Subject: [PATCH 21/40] Rebuilt for new VDR API version --- vdr-epgfixer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index 91cef6b..d3b4355 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -6,12 +6,12 @@ # version we want build against %global vdr_version 2.6.1 %if 0%{?fedora} >= 38 -%global vdr_version 2.6.2 +%global vdr_version 2.6.3 %endif Name: vdr-%{pname} Version: 0.3.1 -Release: 23.%{gitdate}git%{shortcommit}%{?dist} +Release: 24.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ @@ -58,6 +58,9 @@ install -Dpm 644 %{SOURCE1} \ %defattr(-,root,root,-) %changelog +* Wed Dec 14 2022 Martin Gansser - 0.3.1-24.20180416git354f28b +- Rebuilt for new VDR API version + * Thu Dec 01 2022 Martin Gansser - 0.3.1-23.20180416git354f28b - Rebuilt for new VDR API version From 99724d67ef26801e45bab5954bb643ec6f77844a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:09:42 +0000 Subject: [PATCH 22/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-epgfixer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index d3b4355..2de8d48 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -11,7 +11,7 @@ Name: vdr-%{pname} Version: 0.3.1 -Release: 24.%{gitdate}git%{shortcommit}%{?dist} +Release: 25.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ @@ -58,6 +58,9 @@ install -Dpm 644 %{SOURCE1} \ %defattr(-,root,root,-) %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.3.1-25.20180416git354f28b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Dec 14 2022 Martin Gansser - 0.3.1-24.20180416git354f28b - Rebuilt for new VDR API version From 23e4bb95ece55ee9678881eb11cd0d4f60a2754f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:28:49 +0000 Subject: [PATCH 23/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-epgfixer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index 2de8d48..c27fe2d 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -11,7 +11,7 @@ Name: vdr-%{pname} Version: 0.3.1 -Release: 25.%{gitdate}git%{shortcommit}%{?dist} +Release: 26.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ @@ -58,6 +58,9 @@ install -Dpm 644 %{SOURCE1} \ %defattr(-,root,root,-) %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.3.1-26.20180416git354f28b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 0.3.1-25.20180416git354f28b - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From d496e03ccf6626ad0f1ca5468ce44e7bcd142d50 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 26 Jul 2023 14:30:13 +0200 Subject: [PATCH 24/40] Rebuilt for rawhide --- .gitignore | 1 + sources | 2 +- vdr-epgfixer.spec | 21 ++++++++++++--------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 67c0f02..8404e84 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /*.tgz /vdr-plugin-epgfixer-354f28b0112ba27f08f6509243b410899f74b6ed.tar.bz2 +/vdr-epgfixer-0.3.1-git354f28b.tar.gz diff --git a/sources b/sources index 62eba6e..ad025fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-plugin-epgfixer-354f28b0112ba27f08f6509243b410899f74b6ed.tar.bz2) = c27e8d10d61023b4583ac7ddea70d1e7d49436da3fb65a52d6639ceba3f7b8ce8a9ccddc750a0811a30316c424cefcfce639fcfe3ad4adaef40ba0e973b29927 +SHA512 (vdr-epgfixer-0.3.1-git354f28b.tar.gz) = 0446a012f83df10b0203f1e6699256c3a2820edbf4b77e311ea4de5e7bff6e3d362da21f60d0b0cb70ebff519d024deed1d8d25c4b681721ecbd0660a046cec5 diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index c27fe2d..f749c64 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -11,12 +11,12 @@ Name: vdr-%{pname} Version: 0.3.1 -Release: 26.%{gitdate}git%{shortcommit}%{?dist} +Release: 27.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ -URL: https://projects.vdr-developer.org/projects/plg-epgfixer -Source0: https://projects.vdr-developer.org/git/vdr-plugin-epgfixer.git/snapshot/vdr-plugin-epgfixer-%{commit}.tar.bz2 +URL: https://github.com/vdr-projects/vdr-plugin-epgfixer +Source0: https://github.com/vdr-projects/vdr-plugin-epgfixer/archive/%{commit}/%{name}-%{version}-git%{shortcommit}.tar.gz Source1: %{name}.conf BuildRequires: make @@ -39,13 +39,13 @@ editing all settings through setup menu. LIBDIR=. LOCALEDIR=./locale VDRDIR=%{_libdir}/vdr %install -install -dm 755 $RPM_BUILD_ROOT%{vdr_configdir}/plugins/%{pname} -install -pm 644 epgfixer/{blacklist,charset,epgclone,regexp}.conf \ - $RPM_BUILD_ROOT%{vdr_configdir}/plugins/%{pname} -install -Dpm 644 %{SOURCE1} \ - $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf - %make_install +install -dm 755 %{buildroot}%{vdr_configdir}/plugins/%{pname} +install -pm 644 epgfixer/{blacklist,charset,epgclone,regexp}.conf \ + %{buildroot}%{vdr_configdir}/plugins/%{pname} +install -Dpm 644 %{SOURCE1} \ + %{buildroot}%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf + %find_lang %{name} %files -f %{name}.lang @@ -58,6 +58,9 @@ install -Dpm 644 %{SOURCE1} \ %defattr(-,root,root,-) %changelog +* Wed Jul 26 2023 Martin Gansser - 0.3.1-27.20180416git354f28b +- Rebuilt for rawhide + * Sat Jul 22 2023 Fedora Release Engineering - 0.3.1-26.20180416git354f28b - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From daae0794063443045c0e25af19a214d8c0233e5c Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 5 Jan 2024 16:16:04 +0100 Subject: [PATCH 25/40] Rebuilt for new VDR API version --- sources | 2 +- vdr-epgfixer.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index ad025fd..62eba6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-epgfixer-0.3.1-git354f28b.tar.gz) = 0446a012f83df10b0203f1e6699256c3a2820edbf4b77e311ea4de5e7bff6e3d362da21f60d0b0cb70ebff519d024deed1d8d25c4b681721ecbd0660a046cec5 +SHA512 (vdr-plugin-epgfixer-354f28b0112ba27f08f6509243b410899f74b6ed.tar.bz2) = c27e8d10d61023b4583ac7ddea70d1e7d49436da3fb65a52d6639ceba3f7b8ce8a9ccddc750a0811a30316c424cefcfce639fcfe3ad4adaef40ba0e973b29927 diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index f749c64..b863328 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -4,14 +4,14 @@ %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global gitdate 20180416 # version we want build against -%global vdr_version 2.6.1 -%if 0%{?fedora} >= 38 %global vdr_version 2.6.3 +%if 0%{?fedora} >= 40 +%global vdr_version 2.6.5 %endif Name: vdr-%{pname} Version: 0.3.1 -Release: 27.%{gitdate}git%{shortcommit}%{?dist} +Release: 28.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ @@ -58,6 +58,9 @@ install -Dpm 644 %{SOURCE1} \ %defattr(-,root,root,-) %changelog +* Fri Jan 05 2024 Martin Gansser - 0.3.1-28.20180416git354f28b +- Rebuilt for new VDR API version + * Wed Jul 26 2023 Martin Gansser - 0.3.1-27.20180416git354f28b - Rebuilt for rawhide From baa09af0101584bf4595d6487265c1365b65b3c8 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 5 Jan 2024 16:22:07 +0100 Subject: [PATCH 26/40] Rebuilt for new VDR API version --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 62eba6e..ad025fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-plugin-epgfixer-354f28b0112ba27f08f6509243b410899f74b6ed.tar.bz2) = c27e8d10d61023b4583ac7ddea70d1e7d49436da3fb65a52d6639ceba3f7b8ce8a9ccddc750a0811a30316c424cefcfce639fcfe3ad4adaef40ba0e973b29927 +SHA512 (vdr-epgfixer-0.3.1-git354f28b.tar.gz) = 0446a012f83df10b0203f1e6699256c3a2820edbf4b77e311ea4de5e7bff6e3d362da21f60d0b0cb70ebff519d024deed1d8d25c4b681721ecbd0660a046cec5 From 82b5d0c3462c8549abec5321e3f32f3cccf19d07 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 5 Jan 2024 16:30:30 +0100 Subject: [PATCH 27/40] Rebuilt for new VDR API version Add BR gettext for rawhide --- vdr-epgfixer.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index b863328..0c692a0 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -21,6 +21,7 @@ Source1: %{name}.conf BuildRequires: make BuildRequires: gcc-c++ +BuildRequires: gettext BuildRequires: vdr-devel >= %{vdr_version} BuildRequires: pcre-devel Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} @@ -60,6 +61,7 @@ install -Dpm 644 %{SOURCE1} \ %changelog * Fri Jan 05 2024 Martin Gansser - 0.3.1-28.20180416git354f28b - Rebuilt for new VDR API version +- Add BR gettext for rawhide * Wed Jul 26 2023 Martin Gansser - 0.3.1-27.20180416git354f28b - Rebuilt for rawhide From f7ec1114f6000cd0393728dfe10d1d9a4344e147 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 26 Jan 2024 11:03:13 +0100 Subject: [PATCH 28/40] Rebuilt for new VDR API version --- vdr-epgfixer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index 0c692a0..566df81 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -6,12 +6,12 @@ # version we want build against %global vdr_version 2.6.3 %if 0%{?fedora} >= 40 -%global vdr_version 2.6.5 +%global vdr_version 2.6.6 %endif Name: vdr-%{pname} Version: 0.3.1 -Release: 28.%{gitdate}git%{shortcommit}%{?dist} +Release: 29.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ @@ -59,6 +59,9 @@ install -Dpm 644 %{SOURCE1} \ %defattr(-,root,root,-) %changelog +* Fri Jan 26 2024 Martin Gansser - 0.3.1-29.20180416git354f28b +- Rebuilt for new VDR API version + * Fri Jan 05 2024 Martin Gansser - 0.3.1-28.20180416git354f28b - Rebuilt for new VDR API version - Add BR gettext for rawhide From 9814f01700119b0be873525ee630ed11f3826dde Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 12 Apr 2024 14:36:00 +0200 Subject: [PATCH 29/40] Rebuilt for new VDR API version --- vdr-epgfixer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index 566df81..0408fa1 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -6,12 +6,12 @@ # version we want build against %global vdr_version 2.6.3 %if 0%{?fedora} >= 40 -%global vdr_version 2.6.6 +%global vdr_version 2.6.7 %endif Name: vdr-%{pname} Version: 0.3.1 -Release: 29.%{gitdate}git%{shortcommit}%{?dist} +Release: 30.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ @@ -59,6 +59,9 @@ install -Dpm 644 %{SOURCE1} \ %defattr(-,root,root,-) %changelog +* Fri Apr 12 2024 Martin Gansser - 0.3.1-30.20180416git354f28b +- Rebuilt for new VDR API version + * Fri Jan 26 2024 Martin Gansser - 0.3.1-29.20180416git354f28b - Rebuilt for new VDR API version From a28559400c0486894ffa744f4ca4fe183d086d9d Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 11 Jul 2024 14:01:01 +0200 Subject: [PATCH 30/40] Rebuilt for new VDR API version 2.6.8 --- vdr-epgfixer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index 0408fa1..3bdab6e 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -6,12 +6,12 @@ # version we want build against %global vdr_version 2.6.3 %if 0%{?fedora} >= 40 -%global vdr_version 2.6.7 +%global vdr_version 2.6.8 %endif Name: vdr-%{pname} Version: 0.3.1 -Release: 30.%{gitdate}git%{shortcommit}%{?dist} +Release: 31.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ @@ -59,6 +59,9 @@ install -Dpm 644 %{SOURCE1} \ %defattr(-,root,root,-) %changelog +* Thu Jul 11 2024 Martin Gansser - 0.3.1-31.20180416git354f28b +- Rebuilt for new VDR API version 2.6.8 + * Fri Apr 12 2024 Martin Gansser - 0.3.1-30.20180416git354f28b - Rebuilt for new VDR API version From fc6b8f6c9ea86278da453b3939f2ab56cf5a98d6 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 15 Jul 2024 16:06:51 +0200 Subject: [PATCH 31/40] Rebuilt for new VDR API version 2.6.9 --- vdr-epgfixer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index 3bdab6e..a32236f 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -6,12 +6,12 @@ # version we want build against %global vdr_version 2.6.3 %if 0%{?fedora} >= 40 -%global vdr_version 2.6.8 +%global vdr_version 2.6.9 %endif Name: vdr-%{pname} Version: 0.3.1 -Release: 31.%{gitdate}git%{shortcommit}%{?dist} +Release: 32.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ @@ -59,6 +59,9 @@ install -Dpm 644 %{SOURCE1} \ %defattr(-,root,root,-) %changelog +* Mon Jul 15 2024 Martin Gansser - 0.3.1-32.20180416git354f28b +- Rebuilt for new VDR API version 2.6.9 + * Thu Jul 11 2024 Martin Gansser - 0.3.1-31.20180416git354f28b - Rebuilt for new VDR API version 2.6.8 From af2334e2bd0fb7eb7c9099c6c0a31de66287da0c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:38:05 +0000 Subject: [PATCH 32/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- vdr-epgfixer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index a32236f..693e0fa 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -11,7 +11,7 @@ Name: vdr-%{pname} Version: 0.3.1 -Release: 32.%{gitdate}git%{shortcommit}%{?dist} +Release: 33.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPLv2+ @@ -59,6 +59,9 @@ install -Dpm 644 %{SOURCE1} \ %defattr(-,root,root,-) %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.3.1-33.20180416git354f28b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jul 15 2024 Martin Gansser - 0.3.1-32.20180416git354f28b - Rebuilt for new VDR API version 2.6.9 From 3e5d8dbff6358bd522a3f83b9b5b8d06862a6d8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:31:39 +0200 Subject: [PATCH 33/40] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- vdr-epgfixer.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index 693e0fa..09c6d04 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -11,10 +11,11 @@ Name: vdr-%{pname} Version: 0.3.1 -Release: 33.%{gitdate}git%{shortcommit}%{?dist} +Release: 34.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: https://github.com/vdr-projects/vdr-plugin-epgfixer Source0: https://github.com/vdr-projects/vdr-plugin-epgfixer/archive/%{commit}/%{name}-%{version}-git%{shortcommit}.tar.gz Source1: %{name}.conf @@ -59,6 +60,9 @@ install -Dpm 644 %{SOURCE1} \ %defattr(-,root,root,-) %changelog +* Fri Jul 26 2024 Miroslav Suchý - 0.3.1-34.20180416git354f28b +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 0.3.1-33.20180416git354f28b - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 37dddddfed0fdf07ffe03ee6a510e3ec1e18fbf8 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 9 Oct 2024 14:00:07 +0200 Subject: [PATCH 34/40] Rebuilt for new VDR API version 2.7.2 --- vdr-epgfixer.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index 09c6d04..35cf115 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -3,18 +3,20 @@ %global commit 354f28b0112ba27f08f6509243b410899f74b6ed %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global gitdate 20180416 -# version we want build against +# version we want to build against %global vdr_version 2.6.3 -%if 0%{?fedora} >= 40 +# Set vdr_version based on Fedora version +%if 0%{?fedora} >= 42 +%global vdr_version 2.7.2 +%elif 0%{?fedora} >= 40 %global vdr_version 2.6.9 %endif Name: vdr-%{pname} Version: 0.3.1 -Release: 34.%{gitdate}git%{shortcommit}%{?dist} +Release: 35.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data -# Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://github.com/vdr-projects/vdr-plugin-epgfixer Source0: https://github.com/vdr-projects/vdr-plugin-epgfixer/archive/%{commit}/%{name}-%{version}-git%{shortcommit}.tar.gz @@ -60,6 +62,9 @@ install -Dpm 644 %{SOURCE1} \ %defattr(-,root,root,-) %changelog +* Wed Oct 09 2024 Martin Gansser - 0.3.1-35.20180416git354f28b +- Rebuilt for new VDR API version 2.7.2 + * Fri Jul 26 2024 Miroslav Suchý - 0.3.1-34.20180416git354f28b - convert license to SPDX From 8ab5e087f2af85802a7b08a2726081b2e934e8ba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:10:56 +0000 Subject: [PATCH 35/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- vdr-epgfixer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index 35cf115..72baaeb 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -14,7 +14,7 @@ Name: vdr-%{pname} Version: 0.3.1 -Release: 35.%{gitdate}git%{shortcommit}%{?dist} +Release: 36.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPL-2.0-or-later @@ -62,6 +62,9 @@ install -Dpm 644 %{SOURCE1} \ %defattr(-,root,root,-) %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.3.1-36.20180416git354f28b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Oct 09 2024 Martin Gansser - 0.3.1-35.20180416git354f28b - Rebuilt for new VDR API version 2.7.2 From 0435e65af20aa4e565e75cce92a112b0068a1131 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 28 Feb 2025 10:05:12 +0100 Subject: [PATCH 36/40] Rebuilt for new VDR API version 2.7.4 --- vdr-epgfixer.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index 72baaeb..3409684 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -4,17 +4,15 @@ %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global gitdate 20180416 # version we want to build against -%global vdr_version 2.6.3 +%global vdr_version 2.6.9 # Set vdr_version based on Fedora version %if 0%{?fedora} >= 42 -%global vdr_version 2.7.2 -%elif 0%{?fedora} >= 40 -%global vdr_version 2.6.9 +%global vdr_version 2.7.4 %endif Name: vdr-%{pname} Version: 0.3.1 -Release: 36.%{gitdate}git%{shortcommit}%{?dist} +Release: 37.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPL-2.0-or-later @@ -62,6 +60,9 @@ install -Dpm 644 %{SOURCE1} \ %defattr(-,root,root,-) %changelog +* Fri Feb 28 2025 Martin Gansser - 0.3.1-37.20180416git354f28b +- Rebuilt for new VDR API version 2.7.4 + * Sun Jan 19 2025 Fedora Release Engineering - 0.3.1-36.20180416git354f28b - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 2078547c17aef25feb6345924808ae2c4b8acbca Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 27 May 2025 17:07:45 +0200 Subject: [PATCH 37/40] Rebuilt for new VDR API version 2.7.5 --- vdr-epgfixer.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index 3409684..25dfc5d 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -3,16 +3,19 @@ %global commit 354f28b0112ba27f08f6509243b410899f74b6ed %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global gitdate 20180416 -# version we want to build against -%global vdr_version 2.6.9 + # Set vdr_version based on Fedora version -%if 0%{?fedora} >= 42 +%if 0%{?fedora} >= 43 +%global vdr_version 2.7.5 +%elif 0%{?fedora} == 42 %global vdr_version 2.7.4 +%else +%global vdr_version 2.6.9 %endif Name: vdr-%{pname} Version: 0.3.1 -Release: 37.%{gitdate}git%{shortcommit}%{?dist} +Release: 38.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPL-2.0-or-later @@ -60,6 +63,9 @@ install -Dpm 644 %{SOURCE1} \ %defattr(-,root,root,-) %changelog +* Tue May 27 2025 Martin Gansser - 0.3.1-38.20180416git354f28b +- Rebuilt for new VDR API version 2.7.5 + * Fri Feb 28 2025 Martin Gansser - 0.3.1-37.20180416git354f28b - Rebuilt for new VDR API version 2.7.4 From b6563aa804e18a218de8c50f081f1ead5f2271f1 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 22 Jun 2025 12:23:19 +0200 Subject: [PATCH 38/40] Rebuilt for new VDR API version 2.7.6 --- vdr-epgfixer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index 25dfc5d..cc526e7 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -6,7 +6,7 @@ # Set vdr_version based on Fedora version %if 0%{?fedora} >= 43 -%global vdr_version 2.7.5 +%global vdr_version 2.7.6 %elif 0%{?fedora} == 42 %global vdr_version 2.7.4 %else @@ -15,7 +15,7 @@ Name: vdr-%{pname} Version: 0.3.1 -Release: 38.%{gitdate}git%{shortcommit}%{?dist} +Release: 39.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPL-2.0-or-later @@ -63,6 +63,9 @@ install -Dpm 644 %{SOURCE1} \ %defattr(-,root,root,-) %changelog +* Sat Jun 21 2025 Martin Gansser - 0.3.1-39.20180416git354f28b +- Rebuilt for new VDR API version 2.7.6 + * Tue May 27 2025 Martin Gansser - 0.3.1-38.20180416git354f28b - Rebuilt for new VDR API version 2.7.5 From 0a522dbbc5a0392669564c93eda9dd2f618d591a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:00:18 +0000 Subject: [PATCH 39/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- vdr-epgfixer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index cc526e7..405ed83 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -15,7 +15,7 @@ Name: vdr-%{pname} Version: 0.3.1 -Release: 39.%{gitdate}git%{shortcommit}%{?dist} +Release: 40.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPL-2.0-or-later @@ -63,6 +63,9 @@ install -Dpm 644 %{SOURCE1} \ %defattr(-,root,root,-) %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.3.1-40.20180416git354f28b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jun 21 2025 Martin Gansser - 0.3.1-39.20180416git354f28b - Rebuilt for new VDR API version 2.7.6 From 03639b2d093abd620e0324693b6e6df719133d48 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 27 Jul 2025 18:26:28 +0200 Subject: [PATCH 40/40] Rebuilt for new VDR API version 2.7.7 --- vdr-epgfixer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-epgfixer.spec b/vdr-epgfixer.spec index 405ed83..960c388 100644 --- a/vdr-epgfixer.spec +++ b/vdr-epgfixer.spec @@ -6,7 +6,7 @@ # Set vdr_version based on Fedora version %if 0%{?fedora} >= 43 -%global vdr_version 2.7.6 +%global vdr_version 2.7.7 %elif 0%{?fedora} == 42 %global vdr_version 2.7.4 %else @@ -15,7 +15,7 @@ Name: vdr-%{pname} Version: 0.3.1 -Release: 40.%{gitdate}git%{shortcommit}%{?dist} +Release: 41.%{gitdate}git%{shortcommit}%{?dist} Summary: VDR plugin for doing extra fixing of EPG data License: GPL-2.0-or-later @@ -63,6 +63,9 @@ install -Dpm 644 %{SOURCE1} \ %defattr(-,root,root,-) %changelog +* Fri Jul 25 2025 Martin Gansser - 0.3.1-41.20180416git354f28b +- Rebuilt for new VDR API version 2.7.7 + * Fri Jul 25 2025 Fedora Release Engineering - 0.3.1-40.20180416git354f28b - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild