From b2ec1d1df01963422e0ef65b707240841fec68fc Mon Sep 17 00:00:00 2001
From: Xavier Bachelot <xav...@bachelot.org>
Date: Mon, 25 Jul 2016 14:40:39 +0200
Subject: 1.4
---
.gitignore | 1 +
...-1.2.565EgGd-Make-XML-Merge-version-valid.patch | 35 ----------------------
perl-XML-Merge-1.4-makefile.patch | 10 +++++++
perl-XML-Merge-makefile.patch | 14 ---------
perl-XML-Merge.spec | 27 +++++++++--------
sources | 2 +-
6 files changed, 26 insertions(+), 63 deletions(-)
delete mode 100644 XML-Merge-1.2.565EgGd-Make-XML-Merge-version-valid.patch
create mode 100644 perl-XML-Merge-1.4-makefile.patch
delete mode 100644 perl-XML-Merge-makefile.patch
diff --git a/.gitignore b/.gitignore
index 90d149e..318b0e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
XML-Merge-1.2.565EgGd.tgz
+/XML-Merge-1.4.tgz
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
deleted file mode 100644
index adfd94d..0000000
--- a/XML-Merge-1.2.565EgGd-Make-XML-Merge-version-valid.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e046d8c4916193197d3268b8688c831e1073ccf3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@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ř <ppi...@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-1.4-makefile.patch
b/perl-XML-Merge-1.4-makefile.patch
new file mode 100644
index 0000000..5ba2342
--- /dev/null
+++ b/perl-XML-Merge-1.4-makefile.patch
@@ -0,0 +1,10 @@
+--- Makefile.PL.orig 2016-07-25 01:11:21.964891288 +0200
++++ Makefile.PL 2016-07-25 01:19:25.866170534 +0200
+@@ -8,6 +8,7 @@
+ 'LICENSE' => 'gpl_3',
+ 'AUTHOR' => [ 'Pip Stuart <p...@cpan.org>' ],
+ 'EXE_FILES' => [ ],
++ 'PL_FILES' => {},
+ 'TEST_REQUIRES' => {
+ 'Test' => 0,
+ 'Test::More' => 0,
diff --git a/perl-XML-Merge-makefile.patch b/perl-XML-Merge-makefile.patch
deleted file mode 100644
index 2e0cc85..0000000
--- a/perl-XML-Merge-makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile.PL.orig 2007-08-30 16:42:30.000000000 +0200
-+++ Makefile.PL 2007-08-30 16:43:32.000000000 +0200
-@@ -8,8 +8,9 @@
- 'AUTHOR' => 'Pip Stuart <p...@cpan.org>',
- 'EXE_FILES' => [
- ],
-+ 'PL_FILES' => {},
- 'PREREQ_PM' => {
- 'XML::Tidy' => 0,
- }, # Module::Name => 1.1,
- 'dist' => { 'COMPRESS' => 'gzip', 'SUFFIX' => 'tgz' },
-- );
-\ No newline at end of file
-+ );
diff --git a/perl-XML-Merge.spec b/perl-XML-Merge.spec
index 07311c2..c38a6e5 100644
--- a/perl-XML-Merge.spec
+++ b/perl-XML-Merge.spec
@@ -1,15 +1,13 @@
Name: perl-XML-Merge
-Version: 1.2.565EgGd
-Release: 24%{?dist}
+Version: 1.4
+Release: 1%{?dist}
Summary: Flexibly merge XML documents
Group: Development/Libraries
-License: GPLv2
+License: GPLv3
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
+Patch1: perl-XML-Merge-1.4-makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -27,6 +25,9 @@ BuildRequires: perl(warnings)
BuildRequires: perl(XML::Tidy)
# Tests:
BuildRequires: perl(Test)
+BuildRequires: perl(Test::More)
+BuildRequires: perl(Test::Pod)
+BuildRequires: perl(Test::Pod::Coverage)
BuildRequires: perl(XML::XPath)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo
$version))
@@ -48,7 +49,6 @@ child of the other root if no match is found.
%prep
%setup -q -n XML-Merge-%{version}
%patch1 -p0
-%patch2 -p1
%build
@@ -57,7 +57,6 @@ make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
@@ -68,18 +67,20 @@ chmod -R u+w $RPM_BUILD_ROOT/*
make test
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files
-%defattr(-,root,root,-)
%doc README
+%license LICENSE
%{perl_vendorlib}/*
%{_mandir}/man3/XML::Merge.3pm.gz
%changelog
+* Mon Jul 25 2016 Xavier Bachelot <xav...@bachelot.org> - 1.4-1
+- Update to 1.4.
+- Clean up spec.
+- Change License: to GPLv3.
+- Add BR: for better test coverage.
+
* Mon May 16 2016 Jitka Plesnikova <jples...@redhat.com> - 1.2.565EgGd-24
- Perl 5.24 rebuild
diff --git a/sources b/sources
index 95d4523..41702ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bab8d2a11865ee20b2702b0378a53339 XML-Merge-1.2.565EgGd.tgz
+70e8a08aaa18415df2132442489934d9 XML-Merge-1.4.tgz
--
cgit v0.12
http://pkgs.fedoraproject.org/cgit/perl-XML-Merge.git/commit/?h=master&id=b2ec1d1df01963422e0ef65b707240841fec68fc
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@lists.fedoraproject.org
https://lists.fedoraproject.org/admin/lists/perl-devel@lists.fedoraproject.org
