From 8734f23cc1579bf9641f5a422eb8caafe6df1a63 Mon Sep 17 00:00:00 2001 From: Jeff Fearn Date: Jan 24 2008 07:44:20 +0000 Subject: import --- diff --git a/.cvsignore b/.cvsignore index e69de29..8de7776 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +XML-TreeBuilder-3.09.tar.gz diff --git a/XML-TreeBuilder-NoExpand.patch b/XML-TreeBuilder-NoExpand.patch new file mode 100644 index 0000000..d54d715 --- /dev/null +++ b/XML-TreeBuilder-NoExpand.patch @@ -0,0 +1,95 @@ +diff --exclude=.svn -ur XML-TreeBuilder-3.09/Changes perl-XML-TreeBuilder/Changes +--- XML-TreeBuilder-3.09/Changes 2004-06-11 14:28:41.000000000 +1000 ++++ perl-XML-TreeBuilder/Changes 2008-01-18 14:28:37.000000000 +1000 +@@ -1,5 +1,11 @@ + # Time-stamp: "2004-06-10 20:28:41 ADT" + ++2007-12-01 Jeff Fearn ++ ++ Release 3.10 ++ ++ Added NoExpand option to allow entities to be left untouched in xml. ++ + + 2004-06-10 Sean M. Burke + +diff --exclude=.svn -ur XML-TreeBuilder-3.09/lib/XML/TreeBuilder.pm perl-XML-TreeBuilder/lib/XML/TreeBuilder.pm +--- XML-TreeBuilder-3.09/lib/XML/TreeBuilder.pm 2004-06-11 13:59:14.000000000 +1000 ++++ perl-XML-TreeBuilder/lib/XML/TreeBuilder.pm 2008-01-18 16:09:10.000000000 +1000 +@@ -5,6 +5,7 @@ + use strict; + use XML::Element (); + use XML::Parser (); ++use Carp; + use vars qw(@ISA $VERSION); + + $VERSION = '3.09'; +@@ -12,20 +13,33 @@ + + #========================================================================== + sub new { +- my $class = ref($_[0]) || $_[0]; +- # that's the only parameter it knows ++ my ($this, $arg) = @_; ++ my $class = ref($this) || $this; ++ ++ my $NoExpand = defined $arg->{'NoExpand'} ? delete $arg->{'NoExpand'} : 0; ++ ++ if ( %{$arg} ) { ++ croak "unknown args: " . join( ", ", keys %{$arg} ); ++ } + + my $self = XML::Element->new('NIL'); + bless $self, $class; # and rebless +- $self->{'_element_class'} = 'XML::Element'; ++ $self->{'_element_class'} = 'XML::Element'; + $self->{'_store_comments'} = 0; + $self->{'_store_pis'} = 0; + $self->{'_store_declarations'} = 0; ++ $self->{'NoExpand'} = $NoExpand; + + my @stack; + # Compare the simplicity of this to the sheer nastiness of HTML::TreeBuilder! + + $self->{'_xml_parser'} = XML::Parser->new( 'Handlers' => { ++ 'Default' => sub { ++ if ( ( $self->{'NoExpand'} ) && ( $_[1] =~ /&.*\;/ ) ) { ++ $stack[-1]->push_content( $_[1] ); ++ } ++ return; ++ }, + 'Start' => sub { + shift; + if(@stack) { +@@ -103,7 +117,8 @@ + return; + }, + +- }); ++ }, ++ 'NoExpand' => $self->{'NoExpand'}); + + return $self; + } +diff --exclude=.svn -ur XML-TreeBuilder-3.09/t/10main.t perl-XML-TreeBuilder/t/10main.t +--- XML-TreeBuilder-3.09/t/10main.t 2004-06-11 14:22:53.000000000 +1000 ++++ perl-XML-TreeBuilder/t/10main.t 2008-01-17 13:24:55.000000000 +1000 +@@ -20,7 +20,7 @@ + ); + + my $y = XML::Element->new_from_lol( +- ['Gee', ++ ['Gee', { 'NoExpand' => '0'}, + ['~comment', {'text' => ' myorp '}], + ['foo', {'Id'=> 'me', 'xml:foo' => 'lal'}, 'Hello World'], + ['lor'], +@@ -29,8 +29,7 @@ + ] + ); + +- +-ok $x->same_as($y); ++ok($x->same_as($y)); + + unless( $ENV{'HARNESS_ACTIVE'} ) { + $x->dump; diff --git a/perl-XML-TreeBuilder.spec b/perl-XML-TreeBuilder.spec new file mode 100644 index 0000000..8a7322d --- /dev/null +++ b/perl-XML-TreeBuilder.spec @@ -0,0 +1,85 @@ +Summary: Parser that builds a tree of XML::Element objects +Name: perl-XML-TreeBuilder +Version: 3.09 +Release: 9%{?dist} +License: GPL+ or Artistic +Group: Development/Libraries +URL: http://search.cpan.org/dist/XML-TreeBuilder/ +# have to: +# push the patch upstream +Source: http://www.cpan.org/modules/by-module/XML/XML-TreeBuilder-%{version}.tar.gz +Patch0: XML-TreeBuilder-NoExpand.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n) +BuildArch: noarch +BuildRequires: perl +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(HTML::Element) +BuildRequires: perl(HTML::Tagset) +BuildRequires: perl(XML::Parser) +Requires: perl(HTML::Element) perl(HTML::Tagset) perl(XML::Parser) + +%description +perl-XML-TreeBuilder is a Perl module that implements a parser +that builds a tree of XML::Element objects. + +%prep +%setup -q -n XML-TreeBuilder-%{version} +%patch0 -p1 + +%build +%{__perl} Makefile.PL INSTALLDIRS="vendor" +%{__make} %{?_smp_mflags} + +%check +%{__make} test + +%install +%{__rm} -rf $RPM_BUILD_ROOT +%{__make} pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT create_packlist=0 + +### Clean up buildroot +find $RPM_BUILD_ROOT -name .packlist -exec %{__rm} {} \; + +%clean +%{__rm} -rf $RPM_BUILD_ROOT + +%files +%defattr(-, root, root, -) +%doc Changes README +%{_mandir}/man3/*.3pm* +%{perl_vendorlib}/XML/ + +%changelog +* Fri Jan 18 2008 Jeff Fearn - 3.09-9 +- Missed one 3.10 + +* Fri Jan 18 2008 Jeff Fearn - 3.09-8 +- Pretend 3.10 never happened + +* Thu Jan 17 2008 Jeff Fearn - 3.09-7 +- Trimmed Summary + +* Fri Jan 11 2008 Jeff Fearn - 3.09-6 +- Fixed test +- Fixed Source URL +- Added %%check + +* Tue Jan 08 2008 Jeff Fearn - 3.09-5 +- Changed Development/Languages to Development/Libraries + +* Tue Jan 08 2008 Jeff Fearn - 3.09-4 +- Remove %%doc from man files, used glob +- Simplify XML in filelist +- Remove OPTIMIZE setting from make call +- Change buildroot to fedora style +- Remove unused defines + +* Mon Jan 07 2008 Jeff Fearn - 3.09-3 +- Tidy spec file + +* Wed Dec 12 2007 Jeff Fearn - 3.09-2 +- Add dist param +- Add NoExpand to allow entities to pass thru un-expanded + +* Fri May 04 2007 Dag Wieers - 3.09-1 +- Initial package. (using DAR) diff --git a/sources b/sources index e69de29..a4a6028 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +49e04fb6ba12b1414cb490e7f0c712a9 XML-TreeBuilder-3.09.tar.gz