[perl-SOAP-Lite] RPM 4.9 dependency filtering added, Perl 5.14 patch

[Petr Sabata]

commit f29ece2e713fcb57e427b49fea198c67e541675e
Author: Petr Sabata <contyk at redhat.com>
Date:   Fri Jul 22 11:56:52 2011 +0200

    RPM 4.9 dependency filtering added, Perl 5.14 patch

 perl-SOAP-Lite-0.712-XML-Parser-Lite-514.patch |   58 ++++++++++++++++++++++++
 perl-SOAP-Lite.spec                            |   14 +++++-
 2 files changed, 71 insertions(+), 1 deletions(-)
---
diff --git a/perl-SOAP-Lite-0.712-XML-Parser-Lite-514.patch b/perl-SOAP-Lite-0.712-XML-Parser-Lite-514.patch
new file mode 100644
index 0000000..b9f2d35
--- /dev/null
+++ b/perl-SOAP-Lite-0.712-XML-Parser-Lite-514.patch
@@ -0,0 +1,58 @@
+diff --git a/lib/XML/Parser/Lite.pm b/lib/XML/Parser/Lite.pm
+index cee2348..65e5602 100644
+--- a/lib/XML/Parser/Lite.pm
++++ b/lib/XML/Parser/Lite.pm
+@@ -167,7 +167,8 @@ sub _final {
+ sub _start {
+     die "multiple roots, wrong element '$_[0]'\n" if $level++ && !@stack;
+     push(@stack, $_[0]);
+-    Start(__PACKAGE__, @_);
++    my $r=Start(__PACKAGE__, @_);
++    ref($r) eq 'ARRAY' ? $r : undef;
+ }
+ 
+ sub _char {
+@@ -181,29 +182,36 @@ sub _char {
+         die "junk '$_[0]' @{[$level ? 'after' : 'before']} XML element\n"
+         if index("\n\r\t ", substr($_[0],$i,1)) < 0; # or should '< $[' be there
+     }
++    # not sure about this...
++    return [];
+ }
+ 
+ sub _end {
+     no warnings qw(uninitialized);
+     pop(@stack) eq $_[0] or die "mismatched tag '$_[0]'\n";
+-    End(__PACKAGE__, $_[0]);
++    my $r=End(__PACKAGE__, $_[0]);
++    ref($r) eq 'ARRAY' ? $r : undef;
+ }
+ 
+ sub comment {
+-    Comment(__PACKAGE__, $_[0]);
++    my $r=Comment(__PACKAGE__, $_[0]);
++    ref($r) eq 'ARRAY' ? $r : undef;
+ }
+ 
+ sub end {
+-     pop(@stack) eq $_[0] or die "mismatched tag '$_[0]'\n";
+-     End(__PACKAGE__, $_[0]);
+- }
++    pop(@stack) eq $_[0] or die "mismatched tag '$_[0]'\n";
++    my $r=End(__PACKAGE__, $_[0]);
++    ref($r) eq 'ARRAY' ? $r : undef;
++}
+ 
+ sub _doctype {
+-    Doctype(__PACKAGE__, $_[0]);
++    my $r=Doctype(__PACKAGE__, $_[0]);
++    ref($r) eq 'ARRAY' ? $r : undef;
+ }
+ 
+ sub _xmldecl {
+-    XMLDecl(__PACKAGE__, $_[0]);
++    my $r=XMLDecl(__PACKAGE__, $_[0]);
++    ref($r) eq 'ARRAY' ? $r : undef;
+ }
+ 
+ 
diff --git a/perl-SOAP-Lite.spec b/perl-SOAP-Lite.spec
index bffb444..24385be 100644
--- a/perl-SOAP-Lite.spec
+++ b/perl-SOAP-Lite.spec
@@ -1,6 +1,6 @@
 Name:       perl-SOAP-Lite
 Version:    0.712
-Release:    7%{?dist}
+Release:    8%{?dist}
 Summary:    Client and server side SOAP implementation
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -8,6 +8,8 @@ URL:        http://search.cpan.org/dist/SOAP-Lite/
 Source0:    http://search.cpan.org/CPAN/authors/id/M/MK/MKUTTER/SOAP-Lite-%{version}.tar.gz
 # rhbz#663931, rt#58538
 Patch0:     perl-SOAP-Lite-0.712-mod_perl.patch
+# rt#68088
+Patch1:     perl-SOAP-Lite-0.712-XML-Parser-Lite-514.patch
 BuildArch:  noarch
 
 # Core package
@@ -48,12 +50,17 @@ Requires:       perl(URI)
 Requires:       perl(XML::Parser)
 Requires:       perl(XML::Parser::Lite)
 
+# RPM 4.8 filters
 %{?filter_setup:
 %filter_from_requires /perl(My::/d
 %filter_from_provides /perl(My::/d
 %filter_from_provides /perl(LWP::Protocol)/d
 %?perl_default_filter
 }
+# RPM 4.9 filters
+%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}perl\\(My::.*\\)
+%global __provides_exclude %__provides_exclude|perl\\(LWP::Protocol\\)
+%global __requires_exclude %{?_requires_exclude:%__requires_exclude|}perl\\(My::\\)
 
 %description
 SOAP::Lite is a collection of Perl modules which provides a simple and
@@ -63,6 +70,7 @@ client and server side.
 %prep
 %setup -q -n SOAP-Lite-%{version}
 %patch0 -p1 -b .mod_perl
+%patch1 -p1 -b .xml-parser-lite-514
 find examples -type f -exec chmod ugo-x {} \;
 
 %build
@@ -93,6 +101,10 @@ make test
 %{_mandir}/man1/*
 
 %changelog
+* Fri Jul 22 2011 Petr Sabata <contyk at redhat.com> - 0.712-8
+- RPM 4.9 dependency filtering added
+- Add patch for XML::Parser::Lite from rt#68088; perl5.14 fix
+
 * Thu Jul 21 2011 Petr Sabata <contyk at redhat.com> - 0.712-7
 - Perl mass rebuild