diff --git a/.gitignore b/.gitignore index bdca8aa..fa45785 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/HTML-Format-2.09.tar.gz +/HTML-Format-2.10.tar.gz diff --git a/perl-HTML-Format-2.10.diff b/perl-HTML-Format-2.10.diff new file mode 100644 index 0000000..0529acc --- /dev/null +++ b/perl-HTML-Format-2.10.diff @@ -0,0 +1,12 @@ +diff -Naur HTML-Format-2.10.orig/t/rt69426.t HTML-Format-2.10.hacked/t/rt69426.t +--- HTML-Format-2.10.orig/t/rt69426.t 2011-07-18 18:07:49.000000000 +0200 ++++ HTML-Format-2.10/t/rt69426.t 2011-08-19 08:52:13.880661937 +0200 +@@ -28,7 +28,7 @@ + my $desc = $table->{$quoted}; + my $obj = new_ok("HTML::FormatPS"); + my $htree = new_ok("HTML::TreeBuilder"); +- ++ + my $html = 'The ' . $desc . ' is a ' . $quoted . ' character'; + ok( $html, "HTML string containing an $desc should map to $desc" ); + diff --git a/perl-HTML-Format.spec b/perl-HTML-Format.spec index f92c873..e45878e 100644 --- a/perl-HTML-Format.spec +++ b/perl-HTML-Format.spec @@ -1,13 +1,14 @@ Name: perl-HTML-Format -Version: 2.09 -Release: 2%{?dist} +Version: 2.10 +Release: 1%{?dist} Summary: HTML formatter modules Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/HTML-Format/ Source0: http://www.cpan.org/authors/id/N/NI/NIGELM/HTML-Format-%{version}.tar.gz - +# Work-around testsuite failure +Patch0: %{name}-%{version}.diff Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch @@ -32,17 +33,17 @@ BuildRequires: perl(Font::Metrics::TimesItalic) BuildRequires: perl(Font::Metrics::TimesRoman) # for release-testing tests -# Not yet in Fedora: BuildRequires: perl(Pod::Wordlist::hanekomu) +BuildRequires: perl(Pod::Wordlist::hanekomu) BuildRequires: perl(Test::CPAN::Meta) -# Not yet in Fedora: BuildRequires: perl(Test::DistManifest) +BuildRequires: perl(Test::DistManifest) BuildRequires: perl(Test::EOL) -# Not yet in Fedora: BuildRequires: perl(Test::HasVersion) +BuildRequires: perl(Test::HasVersion) BuildRequires: perl(Test::MinimumVersion) BuildRequires: perl(Test::NoTabs) BuildRequires: perl(Test::Pod) >= 1.41 BuildRequires: perl(Test::Portability::Files) BuildRequires: perl(Test::Synopsis) -# Not yet in Fedora: BuildRequires: perl(Test::Vars) +BuildRequires: perl(Test::Vars) # These must match # %FontFamilies in lib/HTML/FormatPS.pm @@ -63,27 +64,43 @@ Requires: perl(Font::Metrics::TimesRoman) %description A collection of modules that formats HTML as plaintext, PostScript or RTF. +# Build in a subdirectory, otherwise the testsuites fail %prep -%setup -q -n HTML-Format-%{version} +%setup -q -c -T -n %{name}-%{version} +%setup -q -T -D -n %{name}-%{version} -a0 +cd HTML-Format-%{version} +%patch0 -p1 +cd .. %build +cd HTML-Format-%{version} %{__perl} Build.PL installdirs=vendor ./Build +cd .. %install +cd HTML-Format-%{version} ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 %{_fixperms} $RPM_BUILD_ROOT/* +cd .. %check +cd HTML-Format-%{version} RELEASE_TESTING=1 ./Build test +cd .. %files %defattr(-,root,root,-) -%doc Changes README LICENSE +%doc HTML-Format-%{version}/Changes HTML-Format-%{version}/README HTML-Format-%{version}/LICENSE %{perl_vendorlib}/HTML %{_mandir}/man3/HTML* %changelog +* Mon Aug 22 2011 Ralf Corsépius - 2.10-1 +- Upstream update. +- Build in HTML-Format-%{version} subdir. +- Add HTML-Format-2.10.diff. + * Tue Jul 19 2011 Petr Sabata - 2.09-2 - Perl mass rebuild diff --git a/sources b/sources index 4ce0ae0..1202ace 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3d3cf06c56a27a5719565072e382ce67 HTML-Format-2.09.tar.gz +34831ec506eaa8a7ad5da698224cf58d HTML-Format-2.10.tar.gz