ppisar pushed to perl-XML-Merge (master). "Fix XML::Merge::VERSION value"

[notifications at fedoraproject.org]

From 92a9675c2ee939f59e472411b81d3297de4cb5e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
Date: Fri, 4 Sep 2015 15:42:12 +0200
Subject: Fix XML::Merge::VERSION value


diff --git a/XML-Merge-1.2.565EgGd-Make-XML-Merge-version-valid.patch b/XML-Merge-1.2.565EgGd-Make-XML-Merge-version-valid.patch
new file mode 100644
index 0000000..adfd94d
--- /dev/null
+++ b/XML-Merge-1.2.565EgGd-Make-XML-Merge-version-valid.patch
@@ -0,0 +1,35 @@
+From e046d8c4916193197d3268b8688c831e1073ccf3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Fri, 4 Sep 2015 15:37:52 +0200
+Subject: [PATCH] Make XML::Merge version valid
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+1.2.565EgGd version is invalid and is refused by ExtUtils::MakeMaker
+7.06 when building reverse dependencies. Therefore the version value
+must be normalized.
+
+CPAN RT#106873
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ Merge.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Merge.pm b/Merge.pm
+index e7ea3a3..60381aa 100644
+--- a/Merge.pm
++++ b/Merge.pm
+@@ -452,7 +452,7 @@ require      XML::Tidy;
+ use base qw( XML::Tidy );
+ use          XML::Tidy;
+ use Carp;
+-our $VERSION     = '1.2.565EgGd'; # major . minor . PipTimeStamp
++our $VERSION     = '1.2.565'; # major . minor . PipTimeStamp
+ our $PTVR        = $VERSION; $PTVR =~ s/^\d+\.\d+\.//; # strip major and minor
+ # Please see `perldoc Time::PT` for an explanation of $PTVR.
+ 
+-- 
+2.4.3
+
diff --git a/perl-XML-Merge.spec b/perl-XML-Merge.spec
index aad0505..d19857e 100644
--- a/perl-XML-Merge.spec
+++ b/perl-XML-Merge.spec
@@ -1,6 +1,6 @@
 Name:           perl-XML-Merge 
 Version:        1.2.565EgGd
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Flexibly merge XML documents
 
 Group:          Development/Libraries
@@ -8,6 +8,8 @@ License:        GPLv2
 URL:            http://search.cpan.org/dist/XML-Merge/
 Source0:        http://search.cpan.org/CPAN/authors/id/P/PI/PIP/XML-Merge-%{version}.tgz
 Patch1:         perl-XML-Merge-makefile.patch
+# Fix XML::Merge::VERSION value, bug #1260125, CPAN RT#106873
+Patch2:         XML-Merge-1.2.565EgGd-Make-XML-Merge-version-valid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch 
@@ -33,6 +35,7 @@ child of the other root if no match is found.
 %prep
 %setup -q -n XML-Merge-%{version}
 %patch1 -p0
+%patch2 -p1
 
 
 %build
@@ -64,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 04 2015 Petr Pisar <ppisar at redhat.com> - 1.2.565EgGd-21
+- Fix XML::Merge::VERSION value (bug #1260125)
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.565EgGd-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/perl-XML-Merge.git/commit/?h=master&id=92a9675c2ee939f59e472411b81d3297de4cb5e8