From 4355e13c7cdf9bd6f13f278ba3bb365061d67d03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
Date: Tue, 22 Sep 2015 12:17:24 +0200
Subject: 2.016 bump

---
 .gitignore                                         |  1 +
 Makefile-Parser-0.216-Do-not-use-usr-bin-env.patch | 49 ++++++++++++++
 Makefile-Parser-0.216-Remove-use-lib.patch         | 32 +++++++++
 Makefile-Parser-0.216-make-4.0-compatibility.patch | 25 +++++++
 perl-Makefile-Parser.spec                          | 79 ++++++++++++++--------
 sources                                            |  2 +-
 6 files changed, 158 insertions(+), 30 deletions(-)
 create mode 100644 Makefile-Parser-0.216-Do-not-use-usr-bin-env.patch
 create mode 100644 Makefile-Parser-0.216-Remove-use-lib.patch
 create mode 100644 Makefile-Parser-0.216-make-4.0-compatibility.patch

diff --git a/.gitignore b/.gitignore
index 57a8be0..ef8c369 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Makefile-Parser-0.211.tar.gz
+/Makefile-Parser-0.216.tar.gz
diff --git a/Makefile-Parser-0.216-Do-not-use-usr-bin-env.patch 
b/Makefile-Parser-0.216-Do-not-use-usr-bin-env.patch
new file mode 100644
index 0000000..684a2ff
--- /dev/null
+++ b/Makefile-Parser-0.216-Do-not-use-usr-bin-env.patch
@@ -0,0 +1,49 @@
+From d14443cf126ac5696bf6cedaeebaf63cc1ca055d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
+Date: Tue, 22 Sep 2015 12:40:55 +0200
+Subject: [PATCH] Do not use /usr/bin/env
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+ExtUtils::MakeMaker rewrites #!perl into correct perl automatically.
+Signed-off-by: Petr Písař <ppi...@redhat.com>
+---
+ script/makesimple | 2 +-
+ script/pgmake-db  | 2 +-
+ script/plmake     | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/script/makesimple b/script/makesimple
+index 58d8d3a..2b805e9 100755
+--- a/script/makesimple
++++ b/script/makesimple
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!perl
+ 
+ use strict;
+ use warnings;
+diff --git a/script/pgmake-db b/script/pgmake-db
+index 9025e3a..43362c3 100755
+--- a/script/pgmake-db
++++ b/script/pgmake-db
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl 
++#!perl 
+ 
+ use strict;
+ use warnings;
+diff --git a/script/plmake b/script/plmake
+index 18ee584..951998b 100644
+--- a/script/plmake
++++ b/script/plmake
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!perl
+ 
+ use strict;
+ use warnings;
+-- 
+2.4.3
+
diff --git a/Makefile-Parser-0.216-Remove-use-lib.patch 
b/Makefile-Parser-0.216-Remove-use-lib.patch
new file mode 100644
index 0000000..d6880b5
--- /dev/null
+++ b/Makefile-Parser-0.216-Remove-use-lib.patch
@@ -0,0 +1,32 @@
+From 686607e6722b9a03e30d3d89c2bbec8d70c1c1e7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
+Date: Tue, 22 Sep 2015 12:39:30 +0200
+Subject: [PATCH] Remove "use lib"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This could have security implications.
+
+CPAN RT#107235
+
+Signed-off-by: Petr Písař <ppi...@redhat.com>
+---
+ script/pgmake-db | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/script/pgmake-db b/script/pgmake-db
+index 215c8de..9025e3a 100755
+--- a/script/pgmake-db
++++ b/script/pgmake-db
+@@ -2,7 +2,6 @@
+ 
+ use strict;
+ use warnings;
+-use lib qw(/home/agentz/gmake-db/lib /home/agentz/mdom-gmake/lib);
+ 
+ #use Smart::Comments;
+ use Getopt::Long;
+-- 
+2.4.3
+
diff --git a/Makefile-Parser-0.216-make-4.0-compatibility.patch 
b/Makefile-Parser-0.216-make-4.0-compatibility.patch
new file mode 100644
index 0000000..e1a81ac
--- /dev/null
+++ b/Makefile-Parser-0.216-make-4.0-compatibility.patch
@@ -0,0 +1,25 @@
+From 097521aae7b4e8d719e9535077905236aefa0f96 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <nt...@debian.org>
+Date: Sun, 7 Sep 2014 15:37:58 +0300
+Subject: [PATCH] make 4.0 compatibility
+
+---
+ lib/Makefile/Parser/GmakeDB.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Makefile/Parser/GmakeDB.pm b/lib/Makefile/Parser/GmakeDB.pm
+index 0e876e0..a221490 100644
+--- a/lib/Makefile/Parser/GmakeDB.pm
++++ b/lib/Makefile/Parser/GmakeDB.pm
+@@ -154,7 +154,7 @@ sub parse ($$) {
+                 undef $var_origin;
+             }
+         }
+-        elsif ($elem =~ /^#\s+(automatic|makefile|default|environment|command 
line)/) {
++        elsif ($elem =~ /^#\s+(automatic|makefile|default|environment|command 
line|'override' directive)/) {
+             $var_origin = $1;
+             $var_origin = 'file' if $var_origin eq 'makefile';
+             $next_var_lineno = $elem->lineno + 1;
+-- 
+2.1.0
+
diff --git a/perl-Makefile-Parser.spec b/perl-Makefile-Parser.spec
index cb860da..f956ea9 100644
--- a/perl-Makefile-Parser.spec
+++ b/perl-Makefile-Parser.spec
@@ -1,58 +1,69 @@
 Name:           perl-Makefile-Parser
-Version:        0.211
-Release:        17%{?dist}
+Version:        0.216
+Release:        1%{?dist}
 Summary:        Simple parser for Makefiles
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Makefile-Parser/
 Source0:        
http://www.cpan.org/authors/id/A/AG/AGENT/Makefile-Parser-%{version}.tar.gz
+# Some support for GNU Make 4.0, CPAN RT#95979
+Patch0:         Makefile-Parser-0.216-make-4.0-compatibility.patch
+# Do not use a home directory into @INC, CPAN RT#107235
+Patch1:         Makefile-Parser-0.216-Remove-use-lib.patch
+# Do not use /usr/bin/env, CPAN RT#107237
+Patch2:         Makefile-Parser-0.216-Do-not-use-usr-bin-env.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  coreutils
 BuildRequires:  findutils
 BuildRequires:  make
-BuildRequires:  sed
 BuildRequires:  perl
+BuildRequires:  perl(inc::Module::Install)
+BuildRequires:  perl(lib)
+BuildRequires:  perl(Module::Install::AutoInstall)
+BuildRequires:  perl(Module::Install::Metadata)
+BuildRequires:  perl(Module::Install::Scripts)
+BuildRequires:  perl(Module::Install::TestBase)
+BuildRequires:  perl(Module::Install::WriteAll)
+BuildRequires:  perl(strict)
+BuildRequires:  sed
+# Run-time:
 BuildRequires:  perl(base)
-BuildRequires:  perl(Carp)
 BuildRequires:  perl(Class::Accessor::Fast)
 BuildRequires:  perl(Class::Trigger) >= 0.13
-BuildRequires:  perl(Config)
-BuildRequires:  perl(CPAN)
+# constant not used at tests
 BuildRequires:  perl(Cwd)
-BuildRequires:  perl(Data::Dumper)
-BuildRequires:  perl(Exporter)
-BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(ExtUtils::MM_Unix)
-BuildRequires:  perl(File::Basename)
-BuildRequires:  perl(File::Find)
-BuildRequires:  perl(File::Path)
-BuildRequires:  perl(File::Slurp)
+# File::Slurp not used at tests
 BuildRequires:  perl(File::Spec)
 BuildRequires:  perl(File::stat)
-BuildRequires:  perl(File::Temp)
-BuildRequires:  perl(Filter::Util::Call)
-BuildRequires:  perl(FindBin)
-BuildRequires:  perl(Getopt::Long)
+# Getopt::Long not used at tests
+# Getopt::Std not used at tests
 BuildRequires:  perl(IPC::Run3) >= 0.036
-BuildRequires:  perl(lib)
 BuildRequires:  perl(List::MoreUtils)
 BuildRequires:  perl(List::Util)
 BuildRequires:  perl(MDOM::Document::Gmake)
 BuildRequires:  perl(MDOM::Util)
 BuildRequires:  perl(overload)
-BuildRequires:  perl(Scalar::Util)
-BuildRequires:  perl(strict)
 BuildRequires:  perl(Text::Balanced)
-BuildRequires:  perl(Text::Diff)
-BuildRequires:  perl(threads::shared)
-BuildRequires:  perl(Time::HiRes)
-BuildRequires:  perl(vars)
 BuildRequires:  perl(warnings)
-Requires:       perl(Class::Trigger) >= 0.13
+# Tests:
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(File::Temp)
+BuildRequires:  perl(FindBin)
+BuildRequires:  perl(Spiffy)
+BuildRequires:  perl(Test::Base)
+BuildRequires:  perl(Test::Base::Filter)
+BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Time::HiRes)
+# Optional tests:
+BuildRequires:  perl(Test::Pod) >= 1.00
+# Test::Pod::Coverage not useful
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo 
$version))
+Requires:       perl(Class::Trigger) >= 0.13
+Requires:       perl(IPC::Run3) >= 0.036
 
-%global __requires_exclude 
%{?__requires_exclude:%__requires_exclude|}^perl\\(Class::Trigger\\)$
+# Remove under-specified dependencies
+%global __requires_exclude 
%{?__requires_exclude:%__requires_exclude|}^perl\\((Class::Trigger|IPC::Run3)\\)$
 
 %description
 This is a simple parser for Makefiles. At this very early stage, the parser
@@ -65,7 +76,15 @@ satisfactory for this purpose, so I decided to build one of 
my own.
 
 %prep
 %setup -q -n Makefile-Parser-%{version}
-# This test is fishy; and yes, it needs to be done here
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+# Remove bundled modules
+rm -r ./inc
+sed -i -e '/^inc\//d' MANIFEST
+# Normalize end of lines
+sed -i -e 's/\r$//' Changes
+# This test does not support GNU make 4.0, CPAN RT#95979
 rm t/makesimple.t && sed -e '/^t\/makesimple\.t/d' MANIFEST
 
 %build
@@ -90,7 +109,6 @@ make test
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root,-)
 %doc Changes README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
@@ -100,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/plmake
 
 %changelog
+* Tue Sep 22 2015 Petr Pisar <ppi...@redhat.com> - 0.216-1
+- 2.016 bump
+
 * Tue Aug 11 2015 Petr Šabata <con...@redhat.com> - 0.211-17
 - Prevent FTBFS by correcting the build time dependency list
 - The dep list is quite long and ugly; most of it comes from the bundled
diff --git a/sources b/sources
index 62043f3..f52c355 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-61498e0db530090d84e757db0824fbdc  Makefile-Parser-0.211.tar.gz
+f8c817d31776cef224836c7e65ad1984  Makefile-Parser-0.216.tar.gz
-- 
cgit v0.12


        
http://pkgs.fedoraproject.org/cgit/perl-Makefile-Parser.git/commit/?h=f23&id=4355e13c7cdf9bd6f13f278ba3bb365061d67d03
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@lists.fedoraproject.org
http://lists.fedoraproject.org/admin/lists/perl-devel@lists.fedoraproject.org

Reply via email to