Author: jfearn
Update of /cvs/pkgs/rpms/perl-XML-TreeBuilder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3703/devel
Modified Files:
XML-TreeBuilder-NoExpand.patch perl-XML-TreeBuilder.spec
Log Message:
always remove NoExpand and ErrorContext attributes from output
XML-TreeBuilder-NoExpand.patch:
Changes | 7 ++-
lib/XML/TreeBuilder.pm | 106 +++++++++++++++++++++++++++++++------------------
t/10main.t | 26 ++++++++++--
3 files changed, 98 insertions(+), 41 deletions(-)
Index: XML-TreeBuilder-NoExpand.patch
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-TreeBuilder/devel/XML-TreeBuilder-NoExpand.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- XML-TreeBuilder-NoExpand.patch 16 Mar 2009 05:07:00 -0000 1.3
+++ XML-TreeBuilder-NoExpand.patch 28 Sep 2009 04:05:07 -0000 1.4
@@ -1,4 +1,3 @@
-Only in XML-TreeBuilder-patched: blib
diff -rubB --exclude=.svn --exclude='*.swp' XML-TreeBuilder-3.09/Changes XML-TreeBuilder-patched/Changes
--- XML-TreeBuilder-3.09/Changes 2004-06-11 14:28:41.000000000 +1000
+++ XML-TreeBuilder-patched/Changes 2009-03-16 14:30:51.000000000 +1000
@@ -16,7 +15,7 @@ diff -rubB --exclude=.svn --exclude='*.s
diff -rubB --exclude=.svn --exclude='*.swp' XML-TreeBuilder-3.09/lib/XML/TreeBuilder.pm XML-TreeBuilder-patched/lib/XML/TreeBuilder.pm
--- XML-TreeBuilder-3.09/lib/XML/TreeBuilder.pm 2004-06-11 13:59:14.000000000 +1000
-+++ XML-TreeBuilder-patched/lib/XML/TreeBuilder.pm 2009-03-16 13:55:57.000000000 +1000
++++ XML-TreeBuilder-patched/lib/XML/TreeBuilder.pm 2009-09-28 13:51:25.000000000 +1000
@@ -5,6 +7,7 @@
use strict;
use XML::Element ();
@@ -43,7 +42,7 @@ diff -rubB --exclude=.svn --exclude='*.s
my $self = XML::Element->new('NIL');
bless $self, $class; # and rebless
-@@ -21,44 +31,51 @@
+@@ -21,44 +31,53 @@
$self->{'_store_comments'} = 0;
$self->{'_store_pis'} = 0;
$self->{'_store_declarations'} = 0;
@@ -66,6 +65,8 @@ diff -rubB --exclude=.svn --exclude='*.s
'Start' => sub {
shift;
- if(@stack) {
++ $self->attr('NoExpand', undef);
++ $self->attr('ErrorContext', undef);
+ if (@stack) {
push @stack, $self->{'_element_class'}->new(@_);
$stack[-2]->push_content( $stack[-1] );
@@ -110,7 +111,7 @@ diff -rubB --exclude=.svn --exclude='*.s
return;
},
-@@ -67,11 +84,11 @@
+@@ -67,11 +86,11 @@
'Attlist' => sub {
return unless $self->{'_store_declarations'};
shift;
@@ -127,7 +128,7 @@ diff -rubB --exclude=.svn --exclude='*.s
)
);
return;
-@@ -80,11 +97,11 @@
+@@ -80,11 +99,11 @@
'Element' => sub {
return unless $self->{'_store_declarations'};
shift;
@@ -144,7 +145,7 @@ diff -rubB --exclude=.svn --exclude='*.s
)
);
return;
-@@ -93,17 +110,32 @@
+@@ -93,17 +112,32 @@
'Doctype' => sub {
return unless $self->{'_store_declarations'};
shift;
@@ -183,7 +184,7 @@ diff -rubB --exclude=.svn --exclude='*.s
return $self;
}
-@@ -110,15 +143,15 @@
+@@ -110,15 +145,15 @@
#==========================================================================
sub _elem # universal accessor...
{
@@ -203,11 +204,9 @@ diff -rubB --exclude=.svn --exclude='*.s
#==========================================================================
-Only in XML-TreeBuilder-patched: Makefile
-Only in XML-TreeBuilder-patched: pm_to_blib
diff -rubB --exclude=.svn --exclude='*.swp' XML-TreeBuilder-3.09/t/10main.t XML-TreeBuilder-patched/t/10main.t
--- XML-TreeBuilder-3.09/t/10main.t 2004-06-11 14:22:53.000000000 +1000
-+++ XML-TreeBuilder-patched/t/10main.t 2009-03-16 13:33:49.000000000 +1000
++++ XML-TreeBuilder-patched/t/10main.t 2009-09-28 13:59:55.000000000 +1000
@@ -2,7 +2,7 @@
# Time-stamp: "2004-06-10 20:22:53 ADT"
@@ -227,7 +226,7 @@ diff -rubB --exclude=.svn --exclude='*.s
unless( $ENV{'HARNESS_ACTIVE'} ) {
$x->dump;
-@@ -45,6 +44,28 @@
+@@ -45,6 +44,27 @@
$x->delete;
$y->delete;
@@ -242,7 +241,6 @@ diff -rubB --exclude=.svn --exclude='*.s
+
+$y = XML::Element->new_from_lol(
+ ['Gee',
-+ { 'NoExpand' => "1", 'ErrorContext' => "2" },
+ ['~comment', {'text' => ' myorp '}],
+ ['foo', {'Id'=> 'me', 'xml:foo' => 'lal'}, 'Hello World'],
+ ['lor'],
Index: perl-XML-TreeBuilder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-TreeBuilder/devel/perl-XML-TreeBuilder.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-XML-TreeBuilder.spec 26 Jul 2009 17:39:37 -0000 1.6
+++ perl-XML-TreeBuilder.spec 28 Sep 2009 04:05:08 -0000 1.7
@@ -1,7 +1,7 @@
Summary: Parser that builds a tree of XML::Element objects
Name: perl-XML-TreeBuilder
Version: 3.09
-Release: 14%{?dist}
+Release: 15%{?dist}
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/XML-TreeBuilder/
@@ -50,6 +50,9 @@ find $RPM_BUILD_ROOT -name .packlist -ex
%{perl_vendorlib}/XML/
%changelog
+* Mon Sep 28 2009 Jeff Fearn <jfearn@xxxxxxxxxx> - 3.09-15
+- Always remove NoExpand and ErrorContext from output
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 3.09-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
Fedora-perl-devel-list mailing list
Fedora-perl-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-perl-devel-list
