From 3fb7a7bc2faa4c299e8c84cb8345fbb7c8fde967 Mon Sep 17 00:00:00 2001
From: Jeff Fearn <jfearn@fedoraproject.org>
Date: Sep 28 2009 04:05:08 +0000
Subject: always remove NoExpand and ErrorContext attributes from output


---

diff --git a/XML-TreeBuilder-NoExpand.patch b/XML-TreeBuilder-NoExpand.patch
index cedf25b..94eebe5 100644
--- a/XML-TreeBuilder-NoExpand.patch
+++ b/XML-TreeBuilder-NoExpand.patch
@@ -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='*.swp' XML-TreeBuilder-3.09/Changes XML-Tre
  
 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='*.swp' XML-TreeBuilder-3.09/lib/XML/TreeBui
    
    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='*.swp' XML-TreeBuilder-3.09/lib/XML/TreeBui
      '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='*.swp' XML-TreeBuilder-3.09/lib/XML/TreeBui
         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='*.swp' XML-TreeBuilder-3.09/lib/XML/TreeBui
           )
         );
         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='*.swp' XML-TreeBuilder-3.09/lib/XML/TreeBui
           )
         );
         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='*.swp' XML-TreeBuilder-3.09/lib/XML/TreeBui
    
    return $self;
  }
-@@ -110,15 +143,15 @@
+@@ -110,15 +145,15 @@
  #==========================================================================
  sub _elem # universal accessor...
  {
@@ -203,11 +204,9 @@ diff -rubB --exclude=.svn --exclude='*.swp' XML-TreeBuilder-3.09/lib/XML/TreeBui
  
  #==========================================================================
  
-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='*.swp' XML-TreeBuilder-3.09/t/10main.t XML-
  
  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='*.swp' XML-TreeBuilder-3.09/t/10main.t XML-
 +
 +$y = XML::Element->new_from_lol(
 + ['Gee',
-+   { 'NoExpand' => "1", 'ErrorContext' => "2" },
 +   ['~comment', {'text' => ' myorp '}],
 +   ['foo', {'Id'=> 'me', 'xml:foo' => 'lal'}, 'Hello World'],
 +   ['lor'],
diff --git a/perl-XML-TreeBuilder.spec b/perl-XML-TreeBuilder.spec
index d46fdde..b153cf0 100644
--- a/perl-XML-TreeBuilder.spec
+++ b/perl-XML-TreeBuilder.spec
@@ -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 -exec %{__rm} {} \;
 %{perl_vendorlib}/XML/
 
 %changelog
+* Mon Sep 28 2009  Jeff Fearn <jfearn@redhat.com> - 3.09-15
+- Always remove NoExpand and ErrorContext from output
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.09-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild