diff --git a/XML-LibXML-2.0129-Adjust-tests-to-libxml2-2.9.5.patch b/XML-LibXML-2.0129-Adjust-tests-to-libxml2-2.9.5.patch deleted file mode 100644 index 77565ce..0000000 --- a/XML-LibXML-2.0129-Adjust-tests-to-libxml2-2.9.5.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 14f879ec851e7f5e32f4895fc93dd391cf841eb9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Wed, 20 Sep 2017 17:17:57 +0200 -Subject: [PATCH] Adjust tests to libxml2-2.9.5 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -libxml2-2.9.5 started accepting empty strings thus -t/48_reader_undef_warning_on_empty_str_rt106830.t test does not make -sense anymore and reports a faluire. - -This patch skips the test when running against libnxml2 >= 2.9.5. - -CPAN RT#122958 - -Signed-off-by: Petr Písař ---- - t/48_reader_undef_warning_on_empty_str_rt106830.t | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/t/48_reader_undef_warning_on_empty_str_rt106830.t b/t/48_reader_undef_warning_on_empty_str_rt106830.t -index 8f704c0..0f656a1 100644 ---- a/t/48_reader_undef_warning_on_empty_str_rt106830.t -+++ b/t/48_reader_undef_warning_on_empty_str_rt106830.t -@@ -30,9 +30,13 @@ use XML::LibXML::Reader; - my $xml_reader = XML::LibXML::Reader->new(string => $empty_xml_doc); - - # TEST -- ok (scalar(!defined($xml_reader)), -- 'xml_reader is undef', -- ); -+ SKIP: { -+ skip 'libxml2 accepts empty strings since 2.9.5 version', 1 -+ if (XML::LibXML::LIBXML_VERSION() >= 20905); -+ ok (scalar(!defined($xml_reader)), -+ 'xml_reader is undef', -+ ); -+ } - - # TEST - eq_or_diff( --- -2.13.5 - diff --git a/perl-XML-LibXML.changes b/perl-XML-LibXML.changes index a29f89a..6680a66 100644 --- a/perl-XML-LibXML.changes +++ b/perl-XML-LibXML.changes @@ -10,6 +10,8 @@ Thu Oct 19 06:06:07 UTC 2017 - coolo@suse.com - Thanks to Daniel Macks for the report and ppisar for a patch. - setNamespace() Enhancements. - Thanks to E. Choroba. +- Dropped patch merged upstream: + * XML-LibXML-2.0129-Adjust-tests-to-libxml2-2.9.5.patch ------------------------------------------------------------------- Tue Sep 26 09:44:35 UTC 2017 - tchvatal@suse.com