rpms/perl-Unicode-Collate
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixes for removal '.' from @INC in perl 5.26

Browse Source
This commit is contained in:
Jitka Plesnikova 2017-05-15 13:57:59 +02:00
parent 753843a9ae
commit ffd313fbc6
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Unicode-Collate-1.19-Fixes-for-removal-dot-from-INC.patch Normal file
View File

@ -0,0 +1,24 @@
diff -up Unicode-Collate-1.19/mklocale.orig Unicode-Collate-1.19/mklocale
--- Unicode-Collate-1.19/mklocale.orig 2017-05-11 14:46:13.491501304 +0200
+++ Unicode-Collate-1.19/mklocale 2017-05-11 14:48:21.829764058 +0200
@@ -546,7 +546,7 @@ for my $txt (@txts) {
s/\s*\z/.pm/;
my $f = File::Spec->catfile($CUR_DIR, split /::/, $_);
$f = 'Korean.pm' if /::Korean\.pm/; # using the newer one
- require $f;
+ require "./$f";
next;
}
if (/^(alternate)\s+(\S+)/) {
diff -up Unicode-Collate-1.19/Makefile.PL.orig Unicode-Collate-1.19/Makefile.PL
--- Unicode-Collate-1.19/Makefile.PL.orig 2017-05-11 14:57:57.113506081 +0200
+++ Unicode-Collate-1.19/Makefile.PL 2017-05-11 14:57:25.895682439 +0200
@@ -6,7 +6,7 @@ my $clean = {};
if (-f "Collate.xs") {
print "Making header files for XS...\n";
- do 'mkheader' or die $@ || "mkheader: $!";
+ do './mkheader' or die $@ || "mkheader: $!";
$clean = { FILES => 'ucatbl.h' };
}

8
perl-Unicode-Collate.spec
View File

@ -1,6 +1,6 @@
Name: perl-Unicode-Collate
Version: 1.19
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Unicode Collation Algorithm
# Collate/allkeys.txt: Unicode (the file contains a link to
# <http://www.unicode.org/terms_of_use.html>)
@ -9,6 +9,7 @@ License: (GPL+ or Artistic) and Unicode
Group: Development/Libraries
URL: http://search.cpan.org/dist/Unicode-Collate/
Source0: http://www.cpan.org/authors/id/S/SA/SADAHIRO/Unicode-Collate-%{version}.tar.gz
Patch0: Unicode-Collate-1.19-Fixes-for-removal-dot-from-INC.patch
BuildRequires: gcc
BuildRequires: findutils
BuildRequires: make
@ -35,6 +36,8 @@ Collation Algorithm).
%prep
%setup -q -n Unicode-Collate-%{version}
%patch0 -p1
# Remove pregenerated files
rm Collate/Locale/*
# Collate/CJK/Korean.pm is input for mklocale script, do not remove it here
@ -65,6 +68,9 @@ make test
%{_mandir}/man3/*
%changelog
* Mon May 15 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1.19-3
- Fixes for removal '.' from @INC in Perl 5.26
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.19-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild