diff --git a/.gitignore b/.gitignore index 360ea98..e05dfb6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ XML-Twig-3.34.tar.gz /XML-Twig-3.39.tar.gz /XML-Twig-3.40.tar.gz /XML-Twig-3.41.tar.gz +/XML-Twig-3.42.tar.gz diff --git a/perl-XML-Twig.spec b/perl-XML-Twig.spec index 5485c6d..8e9f4e1 100644 --- a/perl-XML-Twig.spec +++ b/perl-XML-Twig.spec @@ -1,5 +1,5 @@ Name: perl-XML-Twig -Version: 3.41 +Version: 3.42 Release: 1%{?dist} Summary: Perl module for processing huge XML documents in tree mode License: GPL+ or Artistic @@ -7,70 +7,61 @@ Group: Development/Libraries URL: http://search.cpan.org/dist/XML-Twig/ Source0: http://www.cpan.org/authors/id/M/MI/MIROD/XML-Twig-%{version}.tar.gz BuildArch: noarch - BuildRequires: expat >= 2.0.1 +BuildRequires: perl(ExtUtils::MakeMaker) +# Run-time: BuildRequires: perl(base) BuildRequires: perl(bytes) -BuildRequires: perl(lib) BuildRequires: perl(Carp) -BuildRequires: perl(Config) -BuildRequires: perl(Cwd) BuildRequires: perl(Encode) -BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(File::Spec) -BuildRequires: perl(FindBin) -BuildRequires: perl(HTML::TreeBuilder) >= 4.00 BuildRequires: perl(HTML::Entities::Numbered) BuildRequires: perl(HTML::Tidy) -BuildRequires: perl(HTML::Entities) +BuildRequires: perl(HTML::TreeBuilder) >= 4.00 BuildRequires: perl(IO::Scalar) -BuildRequires: perl(IO::String) -BuildRequires: perl(LWP) BuildRequires: perl(Scalar::Util) BuildRequires: perl(strict) +BuildRequires: perl(Text::Wrap) +BuildRequires: perl(warnings) +BuildRequires: perl(XML::Parser) >= 2.23 +# Prefer XML::XPathEngine over XML::XPath +BuildRequires: perl(XML::XPathEngine) +# Tests: +BuildRequires: perl(Config) +BuildRequires: perl(Cwd) +BuildRequires: perl(FindBin) +BuildRequires: perl(lib) BuildRequires: perl(Test) BuildRequires: perl(Test::More) -BuildRequires: perl(Test::Pod) -BuildRequires: perl(Test::Pod::Coverage) +# Optional tests: +BuildRequires: perl(IO::String) +BuildRequires: perl(LWP) +BuildRequires: perl(HTML::Entities) +BuildRequires: perl(Test::CPAN::Meta::JSON) BuildRequires: perl(Text::Iconv) BuildRequires: perl(Tie::IxHash) -#BuildRequires: perl(Tree::XPathEngine) # not available in Fedora yet -BuildRequires: perl(Test) -%if 0%{!?perl_bootstrap:1} -%if 0%{?fedora} || 0%{?rhel} < 7 -BuildRequires: perl(Test::Kwalitee) -%endif -%endif -BuildRequires: perl(Test::More) -BuildRequires: perl(Test::Pod) -BuildRequires: perl(Test::Pod::Coverage) -BuildRequires: perl(Text::Wrap) -BuildRequires: perl(Text::Iconv) BuildRequires: perl(Unicode::Map8) BuildRequires: perl(Unicode::String) BuildRequires: perl(utf8) -BuildRequires: perl(warnings) BuildRequires: perl(XML::Filter::BufferText) BuildRequires: perl(XML::Handler::YAWriter) -BuildRequires: perl(XML::Parser) >= 2.34 -BuildRequires: perl(XML::SAX::Writer) +BuildRequires: perl(XML::SAX::Writer) >= 0.39 BuildRequires: perl(XML::Simple) -BuildRequires: perl(XML::XPathEngine) -BuildRequires: perl(XML::XPath) -Requires: perl(XML::Parser) >= 2.34 Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) +Requires: perl(Encode) +Requires: perl(HTML::Entities::Numbered) +Requires: perl(HTML::Tidy) +Requires: perl(HTML::TreeBuilder) >= 4.00 +Requires: perl(IO::Scalar) +Requires: perl(Scalar::Util) +Requires: perl(Text::Wrap) +Requires: perl(XML::Parser) >= 2.23 %{?perl_default_filter} - -%{?filter_setup: -%filter_from_provides /perl(XML::XPathEngine::NodeSet)/d -%filter_from_requires /perl(XML::XPath)/d -%filter_from_requires /perl(xml_split::state)/d -%?perl_default_filter -} -%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}perl\\(XML::XPathEngine::NodeSet\\) -%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}perl\\(XML::XPath\\) -%global __requires_exclude %__requires_exclude|perl\\(xml_split::state\\) +%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(XML::XPathEngine::NodeSet\\) +%global __requires_exclude %__requires_exclude|^perl\\(xml_split::state\\) +# Filter under-specified dependencies +%global __requires_exclude %__requires_exclude|^perl\\(XML::Parser\\)$ %description This module provides a way to process XML documents. It is build on @@ -83,17 +74,16 @@ twig_print_outside_roots options. %prep %setup -q -n XML-Twig-%{version} +cp Changes Changes.orig +iconv -f iso88591 -t utf8 < Changes.orig > Changes %build perl Makefile.PL -y INSTALLDIRS=perl make %{?_smp_mflags} -cp Changes Changes.orig -iconv -f iso88591 -t utf8 < Changes.orig > Changes %install -make pure_install PERL_INSTALL_ROOT=%{buildroot} +make pure_install DESTDIR=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} \; -find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* %check @@ -107,6 +97,9 @@ make test %{_mandir}/man3/* %changelog +* Mon Nov 12 2012 Petr Pisar - 3.42-1 +- 3.42 bump + * Tue Aug 14 2012 Petr Ĺ abata - 3.41-1 - 3.41 bump diff --git a/sources b/sources index 3d6d656..301ea1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -79a203a153c8e5e843ce6de59ba56804 XML-Twig-3.41.tar.gz +def3362cfa957ddda33c319819a4fbed XML-Twig-3.42.tar.gz