From 07efeb40d263a4dd2aa7984cca450e63480cb260 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova <jples...@redhat.com> Date: Thu, 18 May 2017 15:38:11 +0200 Subject: Fix building on Perl without '.' in @INC (CPAN RT#120886)
--- ...4-Fix-building-on-Perl-without-dot-in-INC.patch | 32 ++++++++++++++++++++++ perl-Glib.spec | 7 ++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 Glib-1.324-Fix-building-on-Perl-without-dot-in-INC.patch diff --git a/Glib-1.324-Fix-building-on-Perl-without-dot-in-INC.patch b/Glib-1.324-Fix-building-on-Perl-without-dot-in-INC.patch new file mode 100644 index 0000000..af114cf --- /dev/null +++ b/Glib-1.324-Fix-building-on-Perl-without-dot-in-INC.patch @@ -0,0 +1,32 @@ +diff -up Glib-1.324/Makefile.PL.orig Glib-1.324/Makefile.PL +--- Glib-1.324/Makefile.PL.orig 2017-05-18 11:07:22.351192436 +0200 ++++ Glib-1.324/Makefile.PL 2017-05-18 15:10:18.491001843 +0200 +@@ -48,6 +48,7 @@ unless (eval "use ExtUtils::Depends '$PR + + # client modules may use Glib::MakeHelper -- he's not installed at this + # point, so we have to require him directly. ++BEGIN { push @INC, '.'; } + require 'lib/Glib/MakeHelper.pm'; + + mkdir 'build', 0777; +@@ -270,7 +271,7 @@ build/podindex :: \$(INST_LIB)/Glib/GenP + + \$(INST_LIB)/\$(FULLEXT)/xsapi.pod :: build/doc.pl apidoc.pl xsapi.pod.head xsapi.pod.foot + \$(NOECHO) \$(ECHO) Creating XS API documentation... +- \$(NOECHO) \$(FULLPERLRUN) apidoc.pl xsapi.pod.head xsapi.pod.foot build/doc.pl > \$@ ++ \$(NOECHO) \$(FULLPERLRUN) apidoc.pl xsapi.pod.head xsapi.pod.foot ./build/doc.pl > \$@ + + " + . Glib::MakeHelper->postamble_precompiled_headers (qw/gperl.h/) +diff -up Glib-1.324/lib/Glib/MakeHelper.pm.orig Glib-1.324/lib/Glib/MakeHelper.pm +--- Glib-1.324/lib/Glib/MakeHelper.pm.orig 2017-05-18 15:33:33.089780428 +0200 ++++ Glib-1.324/lib/Glib/MakeHelper.pm 2017-05-18 15:34:15.064617665 +0200 +@@ -394,7 +394,7 @@ sub postamble_docs_full { + . ' ' + . $name + . ' $(POD_SET) ' +- . 'xsdoc2pod(q(build/doc.pl), q($(INST_LIB)), q(build/podindex));'; ++ . 'xsdoc2pod(q(./build/doc.pl), q($(INST_LIB)), q(build/podindex));'; + + #warn "docgen_code: $docgen_code\n"; + diff --git a/perl-Glib.spec b/perl-Glib.spec index 5a0e1c3..f985467 100644 --- a/perl-Glib.spec +++ b/perl-Glib.spec @@ -1,11 +1,12 @@ Name: perl-Glib Version: 1.324 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl interface to GLib Group: Development/Libraries License: LGPLv2+ URL: http://search.cpan.org/dist/Glib/ Source0: http://www.cpan.org/authors/id/X/XA/XAOC/Glib-%{version}.tar.gz +Patch0: Glib-1.324-Fix-building-on-Perl-without-dot-in-INC.patch BuildRequires: coreutils BuildRequires: findutils BuildRequires: glib2-devel @@ -71,6 +72,7 @@ to GLib and GObject libraries. %prep %setup -q -n Glib-%{version} +%patch0 -p1 for F in AUTHORS; do iconv -f ISO-8859-1 -t UTF-8 < "$F" > "${F}.utf8" touch -r "$F" "${F}.utf8" @@ -115,6 +117,9 @@ make test %{_mandir}/man3/Glib::xsapi.3pm.gz %changelog +* Thu May 18 2017 Jitka Plesnikova <jples...@redhat.com> - 1.324-3 +- Fix building on Perl without '.' in @INC + * Sat Feb 11 2017 Fedora Release Engineering <rel...@fedoraproject.org> - 1.324-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild -- cgit v1.1 https://src.fedoraproject.org/cgit/perl-Glib.git/commit/?h=master&id=07efeb40d263a4dd2aa7984cca450e63480cb260 _______________________________________________ perl-devel mailing list -- perl-devel@lists.fedoraproject.org To unsubscribe send an email to perl-devel-le...@lists.fedoraproject.org