dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: perl-HTML-Tree
-# $Id$
-NAME := perl-HTML-Tree
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

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;

perl-HTML-Tree.spec

@@ -1,11 +1,14 @@
 Name:           perl-HTML-Tree
 Version:        3.23
-Release:        7%{?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://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,12 @@ 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