commit 16281e1c008f4b2602faea634e53c077420c1cf7 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Sun Apr 28 00:20:31 2019 +0100 Update for XMLTV 0.6.1 .gitignore | 1 + sources | 2 +- xmltv-0.5.63-noask.patch | 12 --- xmltv-0.5.69-Perl526.patch | 50 ------------ xmltv.spec | 200 +++++++++++++++++++++++---------------------- 5 files changed, 105 insertions(+), 160 deletions(-) --- diff --git a/.gitignore b/.gitignore index 213c7bb..51d14bd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ xmltv-0.5.67.tar.bz2 /xmltv-0.5.68.tar.bz2 /xmltv-0.5.69.tar.bz2 /xmltv-0.5.70.tar.bz2 +/xmltv-v0.6.1.tar.gz diff --git a/sources b/sources index 52b1b09..107d9f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aa6c9f9e046199157b2e0e8e77919d10 xmltv-0.5.70.tar.bz2 +74dbd8e9319ec45a3525af8fe0bae0ec xmltv-v0.6.1.tar.gz diff --git a/xmltv.spec b/xmltv.spec index 14fb84f..94328a0 100644 --- a/xmltv.spec +++ b/xmltv.spec @@ -1,91 +1,123 @@ Name: xmltv -Version: 0.5.70 -Release: 5%{?dist} +Version: 0.6.1 +Release: 1%{?dist} Summary: A set of utilities to manage your TV viewing -Group: Development/Libraries License: GPLv2+ URL: http://xmltv.org/wiki/ -Source0: http://downloads.sourceforge.net/xmltv/xmltv-%{version}.tar.bz2 -Patch0: xmltv-0.5.63-noask.patch -Patch1: xmltv-0.5.69-Perl526.patch +Source0: https://github.com/XMLTV/xmltv/archive/v%{version}/xmltv-v%{version}.tar.gz BuildArch: noarch -%if 0%{?fedora} BuildRequires: perl-generators -%endif BuildRequires: perl-devel BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(lib) -BuildRequires: perl(LWP) >= 5.65 -BuildRequires: perl(XML::Parser) >= 2.34 -BuildRequires: perl(XML::Twig) >= 3.28 -BuildRequires: perl(Date::Manip) >= 5.42 -BuildRequires: perl(XML::Writer) >= 0.600 -BuildRequires: perl(Memoize) -BuildRequires: perl(Storable) >= 2.04 +BuildRequires: perl(Term::ReadKey) +BuildRequires: perl(Term::ProgressBar) +BuildRequires: perl(Carp) +BuildRequires: perl(Env) BuildRequires: perl(File::Slurp) -# Recommended -BuildRequires: perl(Lingua::EN::Numbers::Ordinate) -BuildRequires: perl(Lingua::Preferred) >= 0.2.4 -BuildRequires: perl(Term::ProgressBar) >= 2.03 -BuildRequires: perl(Compress::Zlib) +BuildRequires: perl(File::Spec) +BuildRequires: perl(File::Spec::Functions) +BuildRequires: perl(HTTP::Status) +BuildRequires: perl(Search::Dict) +BuildRequires: perl(Tie::Handle) +BuildRequires: perl(Tie::RefHash) +BuildRequires: perl(base) +BuildRequires: perl(constant) +BuildRequires: perl(open) +BuildRequires: perl(strict) +BuildRequires: perl(vars) +BuildRequires: perl(warnings) +BuildRequires: perl(lib) +BuildRequires: perl(integer) BuildRequires: perl(Unicode::String) -## -BuildRequires: perl(HTML::TreeBuilder) -BuildRequires: perl(HTML::Entities) >= 1.27 -BuildRequires: perl(WWW::Mechanize) => 1.16 -BuildRequires: perl(HTTP::Cookies) >= 1.39 -BuildRequires: perl(HTML::Form) -BuildRequires: perl(HTTP::Cache::Transparent) -BuildRequires: perl(LWP::Simple) -BuildRequires: perl(IO::Scalar) +BuildRequires: perl(CGI) +BuildRequires: perl(Tk) +BuildRequires: perl(Tk::ProgressBar) +BuildRequires: perl(Tk::TableMatrix) +BuildRequires: perl(PerlIO::gzip) +BuildRequires: perl(Unicode::String) +BuildRequires: perl(JSON::XS) +BuildRequires: perl(Lingua::Preferred) +# Grabber use BuildRequires: perl(Archive::Zip) -BuildRequires: perl(XML::Simple) -BuildRequires: perl(SOAP::Lite) >= 0.67 -BuildRequires: perl(Term::ReadKey) -%{?_with_text_bidi:BuildRequires: perl(Text::Bidi)} -# This is for tv_grab_jp which is currently disabled in source -#BuildRequires: perl(Text::Kakasi) -BuildRequires: perl(XML::LibXML) -BuildRequires: perl(XML::DOM) -BuildRequires: perl(XML::LibXSLT) +BuildRequires: perl(Carp) BuildRequires: perl(Compress::Zlib) -BuildRequires: perl(IO::Stringy) -BuildRequires: perl(File::Temp) -BuildRequires: perl(Tk::TableMatrix) -BuildRequires: perl(CGI) -BuildRequires: perl(HTML::TokeParser) -BuildRequires: perl(HTML::TableExtract) >= 1.08 -BuildRequires: perl(HTML::Parser) >= 3.34 -BuildRequires: perl(Time::Local) -BuildRequires: perl(Date::Parse) -BuildRequires: perl(Log::TraceMessages) -BuildRequires: perl(Time::HiRes) -BuildRequires: perl(IO::Select) -BuildRequires: perl(JSON) -# Needed for tv_grab_it_dvb but is not available. -#BuildRequires: perl(Linux::DVB) -BuildRequires: perl(Text::Iconv) +BuildRequires: perl(Cwd) BuildRequires: perl(Data::Dumper) -BuildRequires: perl(Parse::RecDescent) -BuildRequires: perl(HTML::Entities) +BuildRequires: perl(Date::Format) +BuildRequires: perl(Date::Language) +BuildRequires: perl(Date::Manip) +BuildRequires: perl(Date::Parse) BuildRequires: perl(DateTime) -BuildRequires: perl(DateTime::Format::Strptime) +BuildRequires: perl(DateTime::Duration) BuildRequires: perl(DateTime::Format::ISO8601) -BuildRequires: perl(Date::Manip) +%if 0%{?rhel} < 7 +# was in el6, no longer in el7? +BuildRequires: perl(DateTime::Format::SQLite) +%endif +BuildRequires: perl(DateTime::Format::Strptime) +BuildRequires: perl(DateTime::TimeZone) +BuildRequires: perl(DBD::SQLite) +BuildRequires: perl(DBI) +BuildRequires: perl(Digest::SHA) BuildRequires: perl(Encode) +BuildRequires: perl(Errno) +BuildRequires: perl(Exporter) +BuildRequires: perl(File::Basename) +BuildRequires: perl(File::HomeDir) BuildRequires: perl(File::Path) +BuildRequires: perl(File::Spec) +BuildRequires: perl(File::Temp) +BuildRequires: perl(File::Which) BuildRequires: perl(Getopt::Long) +BuildRequires: perl(Getopt::Std) +BuildRequires: perl(HTML::Entities) +BuildRequires: perl(HTML::Parser) +BuildRequires: perl(HTML::TreeBuilder) +BuildRequires: perl(HTTP::Cache::Transparent) +BuildRequires: perl(HTTP::Cookies) +BuildRequires: perl(HTTP::Message) +BuildRequires: perl(HTTP::Request) +BuildRequires: perl(HTTP::Request::Common) +BuildRequires: perl(IO::File) +BuildRequires: perl(IO::Scalar) BuildRequires: perl(IO::Uncompress::Unzip) -BuildRequires: perl(JSON::PP) -BuildRequires: perl(Tk) +BuildRequires: perl(JSON) +BuildRequires: perl(List::MoreUtils) +BuildRequires: perl(List::Util) +BuildRequires: perl(LWP) +BuildRequires: perl(LWP::ConnCache) +BuildRequires: perl(LWP::Protocol::https) +BuildRequires: perl(LWP::Simple) +BuildRequires: perl(LWP::UserAgent) +BuildRequires: perl(LWP::UserAgent::Determined) +BuildRequires: perl(Memoize) +BuildRequires: perl(Pod::Usage) +BuildRequires: perl(POSIX) +BuildRequires: perl(Scalar::Util) +BuildRequires: perl(SOAP::Lite) +BuildRequires: perl(Storable) +BuildRequires: perl(Time::HiRes) +BuildRequires: perl(Time::Local) +BuildRequires: perl(Time::Piece) +BuildRequires: perl(Time::Seconds) +BuildRequires: perl(Try::Tiny) BuildRequires: perl(URI) +BuildRequires: perl(URI::Escape) +BuildRequires: perl(URI::URL) +BuildRequires: perl(XML::DOM) +BuildRequires: perl(XML::LibXML) +BuildRequires: perl(XML::LibXSLT) +BuildRequires: perl(XML::Parser) BuildRequires: perl(XML::TreePP) +BuildRequires: perl(XML::Twig) >= 3.10 +BuildRequires: perl(XML::Writer) Requires: xmltv-grabbers >= %{version}-%{release} - +Requires: perl(PerlIO::gzip) +Requires: perl(Unicode::String) %description XMLTV is a set of utilities to manage your TV viewing. They work with @@ -97,8 +129,9 @@ read and write XML documents. %package -n perl-XMLTV Summary: Perl modules for managing your TV viewing -Group: System Environment/Libraries Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(Term::ProgressBar) +Requires: perl(Lingua::Preferred) %description -n perl-XMLTV XMLTV is a set of utilities to manage your TV viewing. They work with @@ -112,7 +145,6 @@ This package contains the perl modules from xmltv. %package grabbers Summary: Backends for xmltv -Group: Applications/Multimedia Requires: perl-XMLTV >= %{version}-%{release} Requires: perl(JSON::XS) @@ -128,7 +160,6 @@ This package contains the backends (grabbers) for xmltv. %package gui Summary: Graphical frontends to xmltv -Group: Applications/Multimedia Requires: perl-XMLTV >= %{version}-%{release} %description gui @@ -141,47 +172,19 @@ read and write XML documents. This package contains graphical frontends to xmltv. + %prep %setup -q -%patch0 -p1 -b .noask -%patch1 -b .perl526 - -# Fix line endings -sed -i 's/\r//' grab/ch_search/tv_grab_ch_search.in - -# Fix encoding -cp -pr ChangeLog ChangeLog.not-utf8 -iconv -f ISO_8859-1 -t UTF8 ChangeLog.not-utf8 > ChangeLog -touch -r ChangeLog.not-utf8 ChangeLog -rm ChangeLog.not-utf8 - -# We filter theses from perl-XMLTV as it already has the infra -#for the tui/gui test. And then xmltv-gui will request perl(Tk::TableMatrix) -#which last will bring the previously filtered ones. -# Filter unwanted Requires: -cat << \EOF > %{name}-req -#!/bin/sh -%{__perl_requires} $* |\ - sed -e '/perl(Tk)/d' | \ - sed -e '/perl(Tk::ProgressBar)/d' - -EOF -%define __perl_requires %{_builddir}/xmltv-%{version}/%{name}-req -chmod +x %{name}-req - %build -%{__perl} Makefile.PL INSTALLDIRS=vendor +%{__perl} Makefile.PL -default INSTALLDIRS=vendor make %{?_smp_mflags} %install make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' - -# Fix perms -chmod 0755 $RPM_BUILD_ROOT%{_bindir}/* +find $RPM_BUILD_ROOT -type f -name .packlist -delete %check @@ -189,7 +192,7 @@ make test %files -%doc ChangeLog README +%doc Changes README %doc doc/* %{_bindir}/tv_augment %{_bindir}/tv_cat @@ -243,6 +246,9 @@ make test %changelog +* Mon Apr 01 2019 Gary Buhrmaster <gary.buhrmaster(a)gmail.com&gt; - 0.6.1-1 +- Update for XMLTV 0.6.1 + * Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 0.5.70-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild