commit fd7c06af3a105e1c116ef90aa067f637335d60da Author: Gary Buhrmaster <gary.buhrmaster(a)gmail.com&gt; Date: Mon May 13 20:17:45 2019 +0000 Pull in upstream patches to resolve grabber issues and remove local fixup ...b.t-specify-input-output-per-published-CL.patch | 29 +++++++++++ ...test_tv_imdb.t-update-usage-documentation.patch | 60 ++++++++++++++++++++++ 0003-tv_imdb-fix-typo-in-documentation.patch | 25 +++++++++ 0004-pt_vodafone-use-utf8-in-POD.patch | 25 +++++++++ ...-pt_vodafone-fix-formatting-issues-in-POD.patch | 45 ++++++++++++++++ 0006-fix-tv_grab_uk_tvguide-urls.patch | 31 +++++++++++ 0007-fix-url-https-and-fix-graber.patch | 34 ++++++++++++ 0008-fix-issue-59-tv_grab_uk_tvguide-60.patch | 42 +++++++++++++++ 0009-Fix-regex-for-programme-duration.patch | 25 +++++++++ ...2-drop-details-of-Windows-98-error-with-P.patch | 57 ++++++++++++++++++++ ...h_channels-after-website-changes-issue-64.patch | 25 +++++++++ 0012-correct-FSF-address-issue-65.patch | 25 +++++++++ ...ion-on-use-XMLTV-to-eliminate-certain-pac.patch | 27 ++++++++++ fix_grabber_requires.patch | 12 ----- xmltv.spec | 33 +++++++++++- 15 files changed, 481 insertions(+), 14 deletions(-) --- diff --git a/0001-test_tv_imdb.t-specify-input-output-per-published-CL.patch b/0001-test_tv_imdb.t-specify-input-output-per-published-CL.patch new file mode 100644 index 0000000..f4788b1 --- /dev/null +++ b/0001-test_tv_imdb.t-specify-input-output-per-published-CL.patch @@ -0,0 +1,29 @@ +From 5463cde27030237d79fedd200e49968edaa06f67 Mon Sep 17 00:00:00 2001 +From: Nick Morrott <knowledgejunkie(a)gmail.com&gt; +Date: Thu, 28 Feb 2019 22:50:43 +0000 +Subject: [PATCH 01/13] test_tv_imdb.t: specify input/output per published CLI + options, rather than with STDIN/STDOUT redirection + +--- + t/test_tv_imdb.t | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/t/test_tv_imdb.t b/t/test_tv_imdb.t +index ad5044646..4dc281a1c 100755 +--- a/t/test_tv_imdb.t ++++ b/t/test_tv_imdb.t +@@ -84,9 +84,9 @@ INPUT: foreach my $input (@inputs) { + my $output="$tmpDir/".File::Basename::basename($input)."-output.xml"; + + # Make temporary directory and split into it. +- my $cmd="$cmds_dir/tv_imdb --quiet --imdbdir '$tmpDir' --with-keywords --with-plot < $input > '$output' 2>&1"; ++ my $cmd="$cmds_dir/tv_imdb --quiet --imdbdir '$tmpDir' --with-keywords --with-plot --output '$output' '$input' 2>&1"; + if ( $input=~m/movies-only/ ) { +- $cmd="$cmds_dir/tv_imdb --movies-only --quiet --imdbdir '$tmpDir' --with-keywords --with-plot < $input > '$output' 2>&1"; ++ $cmd="$cmds_dir/tv_imdb --movies-only --quiet --imdbdir '$tmpDir' --with-keywords --with-plot --output '$output' '$input' 2>&1"; + } + #print STDERR "\nRUN:$cmd\n"; + my $r = system($cmd); +-- +2.21.0 + diff --git a/0002-test_tv_imdb.t-update-usage-documentation.patch b/0002-test_tv_imdb.t-update-usage-documentation.patch new file mode 100644 index 0000000..307e7fe --- /dev/null +++ b/0002-test_tv_imdb.t-update-usage-documentation.patch @@ -0,0 +1,60 @@ +From 76dfb97371ac2d83fc8f1cfb5762ef69c1d71cd7 Mon Sep 17 00:00:00 2001 +From: Nick Morrott <knowledgejunkie(a)gmail.com&gt; +Date: Thu, 28 Feb 2019 23:00:21 +0000 +Subject: [PATCH 02/13] test_tv_imdb.t: update usage documentation + +- update header comment +- replace occurences of tv_split +- add missing --cmds-dir option +--- + t/test_tv_imdb.t | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +diff --git a/t/test_tv_imdb.t b/t/test_tv_imdb.t +index 4dc281a1c..018c70e76 100755 +--- a/t/test_tv_imdb.t ++++ b/t/test_tv_imdb.t +@@ -1,11 +1,8 @@ + #!/usr/bin/perl + # +-# Run tv_split on some input files and check the output looks +-# reasonable. This is not done by diffing against expected output but +-# by reading the files generated and making sure channels and dates +-# seem to match. ++# Run tv_imdb on various input files and check the output is as expected. + # +-# -- Ed Avis, ed(a)membled.com, 2003-10-04 ++# -- Nick Morrott <knowledgejunkie(a)gmail.com&gt;, 2019-02-28 + + use warnings; + use strict; +@@ -14,14 +11,14 @@ use Cwd; + use File::Temp qw(tempdir); + use File::Copy; + use XMLTV::Usage <<END +-$0: test suite for tv_split +-usage: $0 [--tests-dir DIR] [--verbose] ++$0: test suite for tv_imdb ++usage: $0 [--tests-dir DIR] [--cmds-dir DIR] [--verbose] + END + ; + + my $tests_dir = 't/data-tv_imdb'; # where to find input XML files + die "no directory $tests_dir" if not -d $tests_dir; +-my $cmds_dir = 'blib/script'; # directory tv_split lives in ++my $cmds_dir = 'blib/script'; # directory tv_imdb lives in + die "no directory $cmds_dir" if not -d $cmds_dir; + my $verbose = 0; + +@@ -83,7 +80,7 @@ INPUT: foreach my $input (@inputs) { + use File::Basename; + my $output="$tmpDir/".File::Basename::basename($input)."-output.xml"; + +- # Make temporary directory and split into it. ++ # Build command line for test + my $cmd="$cmds_dir/tv_imdb --quiet --imdbdir '$tmpDir' --with-keywords --with-plot --output '$output' '$input' 2>&1"; + if ( $input=~m/movies-only/ ) { + $cmd="$cmds_dir/tv_imdb --movies-only --quiet --imdbdir '$tmpDir' --with-keywords --with-plot --output '$output' '$input' 2>&1"; +-- +2.21.0 + diff --git a/0003-tv_imdb-fix-typo-in-documentation.patch b/0003-tv_imdb-fix-typo-in-documentation.patch new file mode 100644 index 0000000..9785787 --- /dev/null +++ b/0003-tv_imdb-fix-typo-in-documentation.patch @@ -0,0 +1,25 @@ +From 9dc7ae7d52e9d44935fb49f980d9f1280594d8b1 Mon Sep 17 00:00:00 2001 +From: Nick Morrott <knowledgejunkie(a)gmail.com&gt; +Date: Fri, 1 Mar 2019 00:01:48 +0000 +Subject: [PATCH 03/13] tv_imdb: fix typo in documentation + +--- + filter/tv_imdb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/filter/tv_imdb b/filter/tv_imdb +index 0a9c19e7f..ee0b2d887 100755 +--- a/filter/tv_imdb ++++ b/filter/tv_imdb +@@ -151,7 +151,7 @@ How and what to look up needs to be option driven. + Needs some more controls for fine tuning "close" matches. For + instance, currently it looks like the North America grabber only has + date entries for movies, but the imdb.com data contains made for video +-movies as well as as real movies, ot is itE<39>s possible to get the ++movies as well as as real movies, so itE<39>s possible to get the + wrong data to be inserted. In this case we may want to say "ignore tv + series" and "ignore tv mini series". Along with this, weE<39>d want + to define what a "close" match is. For instance does a movie by the +-- +2.21.0 + diff --git a/0004-pt_vodafone-use-utf8-in-POD.patch b/0004-pt_vodafone-use-utf8-in-POD.patch new file mode 100644 index 0000000..196b72d --- /dev/null +++ b/0004-pt_vodafone-use-utf8-in-POD.patch @@ -0,0 +1,25 @@ +From 5162eeacc2f34e007690a2d58d8aece9c80ca58a Mon Sep 17 00:00:00 2001 +From: Nick Morrott <knowledgejunkie(a)gmail.com&gt; +Date: Fri, 1 Mar 2019 01:06:47 +0000 +Subject: [PATCH 04/13] pt_vodafone: use utf8 in POD + +--- + grab/pt_vodafone/tv_grab_pt_vodafone | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/grab/pt_vodafone/tv_grab_pt_vodafone b/grab/pt_vodafone/tv_grab_pt_vodafone +index 1572c33da..b26b99eb0 100755 +--- a/grab/pt_vodafone/tv_grab_pt_vodafone ++++ b/grab/pt_vodafone/tv_grab_pt_vodafone +@@ -2,6 +2,8 @@ + + =pod + ++=encoding utf8 ++ + =head1 NAME + + tv_grab_pt_vodafone - Grab TV listings for Vodafone in Portugal. +-- +2.21.0 + diff --git a/0005-pt_vodafone-fix-formatting-issues-in-POD.patch b/0005-pt_vodafone-fix-formatting-issues-in-POD.patch new file mode 100644 index 0000000..a9a9fe3 --- /dev/null +++ b/0005-pt_vodafone-fix-formatting-issues-in-POD.patch @@ -0,0 +1,45 @@ +From 814afd09f4f63f0999fe20ce2ace461da8b9de14 Mon Sep 17 00:00:00 2001 +From: Nick Morrott <knowledgejunkie(a)gmail.com&gt; +Date: Fri, 1 Mar 2019 01:12:26 +0000 +Subject: [PATCH 05/13] pt_vodafone: fix formatting issues in POD + +--- + grab/pt_vodafone/tv_grab_pt_vodafone | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) + +diff --git a/grab/pt_vodafone/tv_grab_pt_vodafone b/grab/pt_vodafone/tv_grab_pt_vodafone +index b26b99eb0..b55541186 100755 +--- a/grab/pt_vodafone/tv_grab_pt_vodafone ++++ b/grab/pt_vodafone/tv_grab_pt_vodafone +@@ -78,17 +78,21 @@ files are stored. All configuration is stored in $HOME/.xmltv/. On Windows, + it might be necessary to set HOME to a path without spaces in it. + + =head1 CREDITS ++ + Kevin Groeneveld (kgroeneveld at gmail dot com) + +-This grabber uses code from tv_grab_pt_meo by Karl Dietz, dekarl -at- users -dot- sourceforge -dot- net. +-This grabber uses code from tv_grab_zz_sdjson by Kevin Groeneveld, kgroeneveld -at- gmail -dot- com. +-The original idea of this grabber came from higuita's shell script, +-see L<https://github.com/higuita/vodafone.pt-xmltv>;. +-Special thanks to Vodafone, for building a clean, fast and public access API, +-much more reliable than Meo open API ( but sadly not as open) and much better +-than lack of any API from NOS. ++This grabber uses code from tv_grab_pt_meo by Karl Dietz, dekarl -at- users -dot- sourceforge -dot- net, ++and from tv_grab_zz_sdjson by Kevin Groeneveld, kgroeneveld -at- gmail -dot- com. ++ ++The original idea of this grabber came from higuita's shell script, see ++L<https://github.com/higuita/vodafone.pt-xmltv>. ++ ++Special thanks to Vodafone for building a clean, fast, and public access API; ++much more reliable than Meo's open API (but sadly not as open) and much better ++than the lack of any API from NOS. + + =head1 AUTHOR ++ + Nuno Sénica, nsenica -at- gmail -dot- com. + + =head1 BUGS +-- +2.21.0 + diff --git a/0006-fix-tv_grab_uk_tvguide-urls.patch b/0006-fix-tv_grab_uk_tvguide-urls.patch new file mode 100644 index 0000000..98630a6 --- /dev/null +++ b/0006-fix-tv_grab_uk_tvguide-urls.patch @@ -0,0 +1,31 @@ +From 8f4a1bdbce6c5db69d064dd19763d90bb4631d9e Mon Sep 17 00:00:00 2001 +From: Beavis <beavis(a)scaryflop.com&gt; +Date: Fri, 1 Mar 2019 16:27:25 +0100 +Subject: [PATCH 06/13] fix tv_grab_uk_tvguide urls + +--- + grab/uk_tvguide/tv_grab_uk_tvguide | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + mode change 100644 => 100755 grab/uk_tvguide/tv_grab_uk_tvguide + +diff --git a/grab/uk_tvguide/tv_grab_uk_tvguide b/grab/uk_tvguide/tv_grab_uk_tvguide +old mode 100644 +new mode 100755 +index c35ba93ce..5d711f701 +--- a/grab/uk_tvguide/tv_grab_uk_tvguide ++++ b/grab/uk_tvguide/tv_grab_uk_tvguide +@@ -54,9 +54,9 @@ my $VERSION = "$XMLTV::VERSION"; + my $GRABBER_NAME = 'tv_grab_uk_tvguide'; + my $GRABBER_DESC = 'UK - TV Guide (tvguide.co.uk)'; + my $GRABBER_URL = 'http://wiki.xmltv.org/index.php/XMLTVProject'; +-my $ROOT_URL = 'http://my.tvguide.co.uk/'; ++my $ROOT_URL = 'https://www.tvguide.co.uk/'; + my $SOURCE_NAME = 'TV Guide UK'; +-my $SOURCE_URL = 'http://my.tvguide.co.uk/'; ++my $SOURCE_URL = 'https://www.tvguide.co.uk/'; + # + my $generator_info_name = $GRABBER_NAME; + my $generator_info_url = $GRABBER_URL; +-- +2.21.0 + diff --git a/0007-fix-url-https-and-fix-graber.patch b/0007-fix-url-https-and-fix-graber.patch new file mode 100644 index 0000000..607ed70 --- /dev/null +++ b/0007-fix-url-https-and-fix-graber.patch @@ -0,0 +1,34 @@ +From 9b90af5866b4e9e61ed2b9ba5fa291ed4d4e8876 Mon Sep 17 00:00:00 2001 +From: Beavis <beavis(a)scaryflop.com&gt; +Date: Fri, 8 Mar 2019 19:10:16 +0100 +Subject: [PATCH 07/13] fix url (https) and fix graber + +--- + grab/fr/tv_grab_fr | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/grab/fr/tv_grab_fr b/grab/fr/tv_grab_fr +index 027995096..0f59d6663 100755 +--- a/grab/fr/tv_grab_fr ++++ b/grab/fr/tv_grab_fr +@@ -141,7 +141,7 @@ use IO::File; + #*************************************************************************** + # Main declarations + #*************************************************************************** +-my $ROOT_URL = 'http://www.telestar.fr'; ++my $ROOT_URL = 'https://www.telestar.fr'; + my $GRID_FOR_CHANNEL = "$ROOT_URL/programme-tv/"; + my $GRID_BY_CHANNEL_PER_DAY = "$ROOT_URL/programme-tv/grille-chaine/"; + +@@ -916,7 +916,7 @@ sub get_channels { + return %bouquet_channels; + } + +- foreach my $cellTree ( $t->look_down( "_tag", "div", "class", "channel" ) ) { ++ foreach my $cellTree ( $t->look_down( "_tag", "td", "class", "channel" ) ) { + my $tag = $cellTree->look_down( "_tag", "a" ); + if (defined $tag) { + my $progurl = $tag->attr('href'); +-- +2.21.0 + diff --git a/0008-fix-issue-59-tv_grab_uk_tvguide-60.patch b/0008-fix-issue-59-tv_grab_uk_tvguide-60.patch new file mode 100644 index 0000000..5b2ddbc --- /dev/null +++ b/0008-fix-issue-59-tv_grab_uk_tvguide-60.patch @@ -0,0 +1,42 @@ +From d14fac1b28b89682d62e07c4389c69b8c7632c85 Mon Sep 17 00:00:00 2001 +From: Geoff <honir999(a)gmail.com&gt; +Date: Fri, 29 Mar 2019 20:51:58 +0000 +Subject: [PATCH 08/13] fix issue #59 tv_grab_uk_tvguide (#60) + +* Add stop time to programmes which cross the GMT->BST transition (issue #59) +--- + grab/uk_tvguide/tv_grab_uk_tvguide | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/grab/uk_tvguide/tv_grab_uk_tvguide b/grab/uk_tvguide/tv_grab_uk_tvguide +index 5d711f701..0b931f27c 100755 +--- a/grab/uk_tvguide/tv_grab_uk_tvguide ++++ b/grab/uk_tvguide/tv_grab_uk_tvguide +@@ -392,6 +392,7 @@ sub fetch_listings { + $h2 -= 12 if $a2 eq 'am' && $h2 == 12; + $showtime->set(hour => $h, minute => $i, second => 0); + $prog{'start'} = $showtime->strftime("%Y%m%d%H%M%S %z"); ++ my $showtime_ = $showtime->clone; + if (defined $h2 && $h2 >= 0) { + $showtime->add (days => 1) if $h2 < $h; + # see note above re errors with GMT/BST transition +@@ -399,7 +400,15 @@ sub fetch_listings { + $showtime->set(hour => $h2, minute => $i2, second => 0); + $prog{'stop'} = $showtime->strftime("%Y%m%d%H%M%S %z"); + } or do { # catch +- # no output prog 'stop' time ++ # let's see if we can get a duration ++ my ($durh, $durm) = $lhs->as_text =~ /\((?:(\d*)\shours?\s)?(\d*)\sminutes?\)/; ++ if (defined $durh || defined $durm) { ++ $durh = 0 if !defined $durh; $durm = 0 if !defined $durm; ++ $showtime_->set_time_zone('UTC')->add( hours => $durh, minutes => $durm )->set_time_zone('Europe/London'); ++ $prog{'stop'} = $showtime_->strftime("%Y%m%d%H%M%S %z"); ++ } else { ++ # no output prog 'stop' time ++ } + } + } else { + # no output prog 'stop' time +-- +2.21.0 + diff --git a/0009-Fix-regex-for-programme-duration.patch b/0009-Fix-regex-for-programme-duration.patch new file mode 100644 index 0000000..d5a6cb9 --- /dev/null +++ b/0009-Fix-regex-for-programme-duration.patch @@ -0,0 +1,25 @@ +From 82abef0db71cfa0f009513be41bd02f3962e9dbe Mon Sep 17 00:00:00 2001 +From: honir <honir999(a)gmail.com&gt; +Date: Sat, 30 Mar 2019 12:37:40 +0000 +Subject: [PATCH 09/13] Fix regex for programme duration + +--- + grab/uk_tvguide/tv_grab_uk_tvguide | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/grab/uk_tvguide/tv_grab_uk_tvguide b/grab/uk_tvguide/tv_grab_uk_tvguide +index 0b931f27c..0f5ca5200 100755 +--- a/grab/uk_tvguide/tv_grab_uk_tvguide ++++ b/grab/uk_tvguide/tv_grab_uk_tvguide +@@ -401,7 +401,7 @@ sub fetch_listings { + $prog{'stop'} = $showtime->strftime("%Y%m%d%H%M%S %z"); + } or do { # catch + # let's see if we can get a duration +- my ($durh, $durm) = $lhs->as_text =~ /\((?:(\d*)\shours?\s)?(\d*)\sminutes?\)/; ++ my ($durh, $durm) = $lhs->as_text =~ /\((?:(\d*)\shours?)?\s?(?:(\d*)\sminutes?)?\)/; + if (defined $durh || defined $durm) { + $durh = 0 if !defined $durh; $durm = 0 if !defined $durm; + $showtime_->set_time_zone('UTC')->add( hours => $durh, minutes => $durm )->set_time_zone('Europe/London'); +-- +2.21.0 + diff --git a/0010-README.win32-drop-details-of-Windows-98-error-with-P.patch b/0010-README.win32-drop-details-of-Windows-98-error-with-P.patch new file mode 100644 index 0000000..237eeef --- /dev/null +++ b/0010-README.win32-drop-details-of-Windows-98-error-with-P.patch @@ -0,0 +1,57 @@ +From 370d3e50a034509a3ae8fcbed1df00380c673120 Mon Sep 17 00:00:00 2001 +From: Nick Morrott <knowledgejunkie(a)gmail.com&gt; +Date: Sat, 6 Apr 2019 03:07:36 +0100 +Subject: [PATCH 10/13] README.win32: drop details of Windows 98 error with + Perl 5.8 + +--- + doc/README.win32 | 26 -------------------------- + 1 file changed, 26 deletions(-) + +diff --git a/doc/README.win32 b/doc/README.win32 +index 27484a9ce..7630fac56 100644 +--- a/doc/README.win32 ++++ b/doc/README.win32 +@@ -18,9 +18,6 @@ for tv_grab_is, tv_grab_pt_meo and tv_grab_it_dvb, If you need one + of those you'll need to install Perl and the necessary modules and + use the full distribution. + +-Some Win98 users get errors in Perl58.dll when running tv_grab_na_dd. See +-below for more info. +- + tv_grab_se_swedb sometimes fails to work on Windows if there are spaces + in the path to your home-directory. This can be avoided by setting + the environment variable HOME to a path without spaces (e.g. c:\home). +@@ -91,29 +88,6 @@ To get around this, use %% to pass a % to the application. (ex. %%Y%%M ) + If you *DO* want to insert a shell variable, you can do so by surrounding + it with percents. (ex %HOME% ) + +-* crash in with PERL58.DLL +- +-When using tv_grab_na_dd, some users are experiencing a crash in the +-Perl58.DLL. +- +-I had a similar problem when I had an older version of Perl installed +-as well as XMLTV. It seems to cause DLL confusion and eventually a program +-crash. +- +-I fixed my system when I removed the old Perl. Re-installing Perl +-didn't cause the problem to return. +- +-Before that, I used the work-around below (I could fetch 3 days) +- +-tv_grab_na_dd --output=a.xml --days 3 +-tv_grab_na_dd --output=b.xml --days 3 --offset 3 +-tv_grab_na_dd --output=c.xml --days 1 --offset 6 +-tv_cat a.xml b.xml c.xml >guide.xml +- +-I really thought this problem would be a fluke and/or easily solved +-when I solved it for myself. That doesn't look to be the case. I'm +-looking for a solution. +- + * Proxy servers + + Proxy server support is provide by the LWP modules. +-- +2.21.0 + diff --git a/0011-fix-fetch_channels-after-website-changes-issue-64.patch b/0011-fix-fetch_channels-after-website-changes-issue-64.patch new file mode 100644 index 0000000..3ac3fc9 --- /dev/null +++ b/0011-fix-fetch_channels-after-website-changes-issue-64.patch @@ -0,0 +1,25 @@ +From 59b8a0830e1ca0f923737bff81c9fbf5f1bb1ef6 Mon Sep 17 00:00:00 2001 +From: Geoff Westcott <honir999(a)gmail.com&gt; +Date: Thu, 25 Apr 2019 18:51:31 +0100 +Subject: [PATCH 11/13] fix fetch_channels() after website changes (issue #64) + +--- + grab/uk_tvguide/tv_grab_uk_tvguide | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/grab/uk_tvguide/tv_grab_uk_tvguide b/grab/uk_tvguide/tv_grab_uk_tvguide +index 0f5ca5200..53c99a035 100755 +--- a/grab/uk_tvguide/tv_grab_uk_tvguide ++++ b/grab/uk_tvguide/tv_grab_uk_tvguide +@@ -750,7 +750,7 @@ sub fetch_channels { + + # Fetch channels via a dummy call to BBC1 listings + # http://www.tvguide.co.uk/channellisting.asp?ch=86&cTime= +- my $channel_list = $ROOT_URL.'channellisting.asp?ch=86&cTime='; ++ my $channel_list = $ROOT_URL.'channellisting.asp?ch=74&cTime='; + + my $result; + my $channels = {}; +-- +2.21.0 + diff --git a/0012-correct-FSF-address-issue-65.patch b/0012-correct-FSF-address-issue-65.patch new file mode 100644 index 0000000..a901dcc --- /dev/null +++ b/0012-correct-FSF-address-issue-65.patch @@ -0,0 +1,25 @@ +From 707fbd7db3c2fc240eaea0d214880b3ec78875a4 Mon Sep 17 00:00:00 2001 +From: Gary Buhrmaster <gary.buhrmaster(a)gmail.com&gt; +Date: Sun, 28 Apr 2019 00:52:12 +0000 +Subject: [PATCH 12/13] correct FSF address (issue #65) + +--- + filter/tv_to_potatoe | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/filter/tv_to_potatoe b/filter/tv_to_potatoe +index b238a5cdd..1660ca1bc 100755 +--- a/filter/tv_to_potatoe ++++ b/filter/tv_to_potatoe +@@ -12,7 +12,7 @@ + # You should have received a copy of the GNU General Public License + # along with this program; if not, you can either send email to this + # program's maintainer or write to: The Free Software Foundation, +-# Inc.; 675 Massachusetts Avenue; Cambridge, MA 02139, USA. ++# Inc.; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + =pod + +-- +2.21.0 + diff --git a/0013-remove-version-on-use-XMLTV-to-eliminate-certain-pac.patch b/0013-remove-version-on-use-XMLTV-to-eliminate-certain-pac.patch new file mode 100644 index 0000000..af2bbb2 --- /dev/null +++ b/0013-remove-version-on-use-XMLTV-to-eliminate-certain-pac.patch @@ -0,0 +1,27 @@ +From 240d20348776add5dafb1642d05c4ee139131d29 Mon Sep 17 00:00:00 2001 +From: Gary Buhrmaster <gary.buhrmaster(a)gmail.com&gt; +Date: Tue, 30 Apr 2019 04:19:30 +0000 +Subject: [PATCH 13/13] remove version on 'use XMLTV' to eliminate certain + packaging issues. + +(cherry picked from commit 2307a8d56e8dcf470423be63c4884ec560200dea) +--- + grab/zz_sdjson_sqlite/tv_grab_zz_sdjson_sqlite | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/grab/zz_sdjson_sqlite/tv_grab_zz_sdjson_sqlite b/grab/zz_sdjson_sqlite/tv_grab_zz_sdjson_sqlite +index 832e8f514..054634cf5 100644 +--- a/grab/zz_sdjson_sqlite/tv_grab_zz_sdjson_sqlite ++++ b/grab/zz_sdjson_sqlite/tv_grab_zz_sdjson_sqlite +@@ -127,7 +127,7 @@ use utf8; + + STDERR->autoflush(1); # Autoflush STDERR + +-use XMLTV 0.005067; ++use XMLTV; + use XMLTV::Options qw/ParseOptions/; + use XMLTV::Configure::Writer; + use XMLTV::Configure qw/LoadConfig SaveConfig/; +-- +2.21.0 + diff --git a/xmltv.spec b/xmltv.spec index c8776e7..f78708b 100644 --- a/xmltv.spec +++ b/xmltv.spec @@ -1,12 +1,37 @@ Name: xmltv Version: 0.6.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A set of utilities to manage your TV viewing License: GPLv2+ URL: http://xmltv.org/wiki/ Source0: https://github.com/XMLTV/xmltv/archive/v%{version}/xmltv-v%{version}.tar.gz -Patch0: fix_grabber_requires.patch +# Upstream commit 5463cde - test_tv_imdb.t: specify input/output per published CLI +Patch0001: 0001-test_tv_imdb.t-specify-input-output-per-published-CL.patch +# Upstream commit 76dfb97 - test_tv_imdb.t: update usage documentation +Patch0002: 0002-test_tv_imdb.t-update-usage-documentation.patch +# Upstream commit 9dc7ae7 - tv_imdb: fix typo in documentation +Patch0003: 0003-tv_imdb-fix-typo-in-documentation.patch +# Upstream commit 5162eea - pt_vodafone: use utf8 in POD +Patch0004: 0004-pt_vodafone-use-utf8-in-POD.patch +# Upstream commit 814afd0 - pt_vodafone: fix formatting issues in POD +Patch0005: 0005-pt_vodafone-fix-formatting-issues-in-POD.patch +# Upstream commit 8f4a1bd - fix tv_grab_uk_tvguide urls +Patch0006: 0006-fix-tv_grab_uk_tvguide-urls.patch +# Upstream commit 9b90af5 - fix url (https) and fix graber +Patch0007: 0007-fix-url-https-and-fix-graber.patch +# Upstream commit d14fac1 - fix issue #59 tv_grab_uk_tvguide (#60) +Patch0008: 0008-fix-issue-59-tv_grab_uk_tvguide-60.patch +# Upstream commit 82abef0 - Fix regex for programme duration +Patch0009: 0009-Fix-regex-for-programme-duration.patch +# Upstream commit 370d3e5 - README.win32: drop details of Windows 98 error with Perl 5.8 +Patch0010: 0010-README.win32-drop-details-of-Windows-98-error-with-P.patch +# Upstream commit 59b8a08 - fix fetch_channels() after website changes (issue #64) +Patch0011: 0011-fix-fetch_channels-after-website-changes-issue-64.patch +# Upstream commit 707fbd7 - correct FSF address (issue #65) +Patch0012: 0012-correct-FSF-address-issue-65.patch +# Upstream commit 240d203 - remove version on 'use XMLTV' to eliminate certain packaging issues. +Patch0013: 0013-remove-version-on-use-XMLTV-to-eliminate-certain-pac.patch BuildArch: noarch @@ -247,6 +272,10 @@ make test %changelog +* Mon May 13 2019 Gary Buhrmaster <gary.buhrmaster(a)gmail.com&gt; - 0.6.1-5 +- Pull in patches from upstream to resolve various issues and remove + local fixup for versioning + * Sun May 12 2019 Gary Buhrmaster <gary.buhrmaster(a)gmail.com&gt; - 0.6.1-4 - Correct permissions of installed files