diff --git a/HTML-Format-2.04.tar.bz2 b/HTML-Format-2.04.tar.bz2
deleted file mode 100644
index 35ff25a..0000000
--- a/HTML-Format-2.04.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fa4200dc7397401956f55bfffa65520d6997485564c07803b39bd786bd2676d2
-size 22026
diff --git a/HTML-Format-2.05.tar.bz2 b/HTML-Format-2.05.tar.bz2
new file mode 100644
index 0000000..95dfba9
--- /dev/null
+++ b/HTML-Format-2.05.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f367ecc770cfc93c2b8f99843eba06b086608ad9e0df8424e306f89996c2c5b9
+size 39026
diff --git a/perl-HTML-Format.changes b/perl-HTML-Format.changes
index a683247..cb9c555 100644
--- a/perl-HTML-Format.changes
+++ b/perl-HTML-Format.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Mon Feb 21 14:43:20 UTC 2011 - vcizek@novell.com
+
+- update to 2.05
+ - Smoke tests on windows showed needed make PS tests less strict
+ - Changed the github location to be all lowercase
+ - Releasing this as a stop gap - will do further work now
+ incompatibilities dealt with
+ - Added dependancies for font metrics files
+ - Documentation tidy up - but needs further work
+ - RT#54636 - UNIVERSAL::Can deprecated
+ - RT#56278 - RTF formatting parameters ignored by new
+ - Git conversion
+ - Dist::Zilla conversion
+ - removed universal-can.patch (merged in upstream)
+
-------------------------------------------------------------------
Wed Feb 2 13:41:03 UTC 2011 - vcizek@novell.com
diff --git a/perl-HTML-Format.spec b/perl-HTML-Format.spec
index 9a0f335..0463acb 100644
--- a/perl-HTML-Format.spec
+++ b/perl-HTML-Format.spec
@@ -20,17 +20,16 @@
Name: perl-HTML-Format
%define cpan_name HTML-Format
-BuildRequires: perl-Font-AFM perl-HTML-Tree
-BuildRequires: perl-macros
+BuildRequires: perl-Font-AFM perl-HTML-Tree perl-File-Slurp
+BuildRequires: perl-macros perl(Test::More) >= 0.96
License: Artistic ; GPLv2+
Group: Development/Libraries/Perl
Requires: perl-HTML-Parser perl-HTML-Tagset perl-Font-AFM perl-HTML-Tree
AutoReqProv: on
Summary: Perl Modules to Format HTML into Plain Text, PostScript, or RTF
-Version: 2.04
+Version: 2.05
Release: 150
Source: %{cpan_name}-%{version}.tar.bz2
-Patch1: universal-can.patch
Url: http://cpan.org/authors/id/S/SB/SBURKE
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{perl_requires}
@@ -49,12 +48,11 @@ Authors:
%prep
%setup -n %{cpan_name}-%{version}
-## universal-can.patch
-%patch1 -p1
-
%build
perl Makefile.PL
make %{?_smp_mflags}
+
+%check
make test
%install
diff --git a/universal-can.patch b/universal-can.patch
deleted file mode 100644
index 6dcf95e..0000000
--- a/universal-can.patch
+++ /dev/null
@@ -1,37 +0,0 @@
----
- lib/HTML/Formatter.pm | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-Index: HTML-Format-2.04/lib/HTML/Formatter.pm
-===================================================================
---- HTML-Format-2.04.orig/lib/HTML/Formatter.pm
-+++ HTML-Format-2.04/lib/HTML/Formatter.pm
-@@ -107,7 +107,6 @@ use HTML::Element 3.15 ();
-
- use strict;
- use Carp;
--use UNIVERSAL qw(can);
-
- use vars qw($VERSION @Size_magic_numbers);
- $VERSION = sprintf("%d.%02d", q$Revision: 2.04 $ =~ /(\d+)\.(\d+)/);
-@@ -207,7 +206,7 @@ sub format
- my($self, $html) = @_;
-
- croak "Usage: \$formatter->format(\$tree)"
-- unless defined $html and ref $html and can($html, 'tag');
-+ unless defined $html and ref $html and $html->can('tag');
-
- if( $self->DEBUG() > 4 ) {
- print "Tree to format:\n";
-@@ -228,9 +227,9 @@ sub format
- if (ref $node) {
- $tag = $node->tag;
- $func = $tag . '_' . ($start ? "start" : "end");
-- # Use UNIVERSAL::can so that we can recover if
-+ # Use ->can so that we can recover if
- # a handler is not defined for the tag.
-- if (can($self, $func)) {
-+ if ($self->can($func)) {
- DEBUG > 3 and print ' ' x $depth, "Calling $func\n";
- return $self->$func($node);
- } else {