From be6ea50b4edbb388f25451da28e5647f60b5c7dd Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Mon, 28 Sep 2009 14:33:09 +0000
Subject: [PATCH] fix missing close tag issue (bz 525587)

---
 missing_close_tag.patch | 12 ++++++++++++
 perl-HTML-Tree.spec     | 29 +++++++++++++++++++++++++++--
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 missing_close_tag.patch

diff --git a/missing_close_tag.patch b/missing_close_tag.patch
new file mode 100644
index 0000000..b82f936
--- /dev/null
+++ b/missing_close_tag.patch
@@ -0,0 +1,12 @@
+diff -ur HTML-Tree-3.23/lib/HTML/Element.pm HTML-Tree-3.23-fix/lib/HTML/Element.pm
+--- HTML-Tree-3.23/lib/HTML/Element.pm	2006-11-13 03:13:33.000000000 +1000
++++ HTML-Tree-3.23-fix/lib/HTML/Element.pm	2009-09-23 14:22:12.000000000 +1000
+@@ -2041,7 +2041,7 @@
+          and ref($this) # sanity
+          and not(
+                  $this->{'_empty_element'}
+-                 || $empty_element_map->{$this->{'_tag'} || ''}
++                 || ($empty_element_map->{$this->{'_tag'} || ''} && !@{$this->{'_content'}})
+                 ) # things that don't get post-order callbacks
+       ) {
+         shift @I;
diff --git a/perl-HTML-Tree.spec b/perl-HTML-Tree.spec
index cb72e2d..5d481f2 100644
--- a/perl-HTML-Tree.spec
+++ b/perl-HTML-Tree.spec
@@ -1,11 +1,14 @@
 Name:           perl-HTML-Tree
 Version:        3.23
-Release:        2%{?dist}
+Release:        9%{?dist}
 Summary:        HTML tree handling modules for Perl
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/HTML-Tree/
-Source0:        http://www.cpan.org/authors/id/P/PE/PETDANCE/HTML-Tree-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/P/PE/PETEK/HTML-Tree-%{version}.tar.gz
+# Upstream bug filed:
+# https://rt.cpan.org/Ticket/Display.html?id=49932
+Patch0:         missing_close_tag.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(HTML::Parser) >= 2.19
@@ -25,6 +28,7 @@ a separate development track.
 
 %prep
 %setup -q -n HTML-Tree-%{version}
+%patch0 -p1 -b .missing-close-tag
 %{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' htmltree
 
 cat << \EOF > %{name}-prov
@@ -59,6 +63,27 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/HTML::*3*
 
 %changelog
+* Mon Sep 28 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 1:3.23-9
+- apply Jeff Fearn's fix for the missing close tag bug (bz 535587)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.23-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.23-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.23-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Nov 20 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1:3.23-5
+- fix source url
+
+* Wed Feb 27 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1:3.23-4
+- Rebuild for perl 5.10 (again)
+
+* Sun Jan 20 2008 Tom "spot" Callaway <tcallawa@redhat.com> 3.23-3
+- rebuild for new perl
+
 * Sun Aug 26 2007 Tom "spot" Callaway <tcallawa@redhat.com> 3.23-2
 - license tag fix