diff --git a/.gitignore b/.gitignore index dce16e4..fb39cd2 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /Unicode-Collate-1.17.tar.gz /Unicode-Collate-1.18.tar.gz /Unicode-Collate-1.19.tar.gz +/Unicode-Collate-1.20.tar.gz diff --git a/Unicode-Collate-1.19-Fixes-for-removal-dot-from-INC.patch b/Unicode-Collate-1.19-Fixes-for-removal-dot-from-INC.patch deleted file mode 100644 index aae5e3b..0000000 --- a/Unicode-Collate-1.19-Fixes-for-removal-dot-from-INC.patch +++ /dev/null @@ -1,24 +0,0 @@ -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' }; - } diff --git a/Unicode-Collate-1.20-Fixes-for-removal-dot-from-INC.patch b/Unicode-Collate-1.20-Fixes-for-removal-dot-from-INC.patch new file mode 100644 index 0000000..ceed739 --- /dev/null +++ b/Unicode-Collate-1.20-Fixes-for-removal-dot-from-INC.patch @@ -0,0 +1,31 @@ +From 1538096643d1197db700fe16969a47ecddfaac99 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Fri, 3 Nov 2017 09:38:44 +0100 +Subject: [PATCH] Fixes for removal dot from INC +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +CPAN RT#121664 + +Signed-off-by: Petr Písař +--- + mklocale | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mklocale b/mklocale +index a1f7092..1e607be 100644 +--- a/mklocale ++++ b/mklocale +@@ -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+)/) { +-- +2.13.6 + diff --git a/perl-Unicode-Collate.spec b/perl-Unicode-Collate.spec index f98e194..9f95a82 100644 --- a/perl-Unicode-Collate.spec +++ b/perl-Unicode-Collate.spec @@ -1,6 +1,6 @@ Name: perl-Unicode-Collate -Version: 1.19 -Release: 395%{?dist} +Version: 1.20 +Release: 1%{?dist} Summary: Unicode Collation Algorithm # Collate/allkeys.txt: Unicode (the file contains a link to # ) @@ -9,7 +9,8 @@ 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 +# Adapt to Perl without "." im @INC, CPAN RT#121664 +Patch0: Unicode-Collate-1.20-Fixes-for-removal-dot-from-INC.patch BuildRequires: gcc BuildRequires: findutils BuildRequires: make @@ -68,6 +69,9 @@ make test %{_mandir}/man3/* %changelog +* Fri Nov 03 2017 Petr Pisar - 1.20-1 +- 1.20 bump + * Thu Aug 03 2017 Fedora Release Engineering - 1.19-395 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 210d28d..9b877cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6f9dcc7801fa2516993dcb59f8b61f6d Unicode-Collate-1.19.tar.gz +SHA512 (Unicode-Collate-1.20.tar.gz) = a0bc62e087f453c3146c1274b3c821ff6f029619d52fbdfe0357e7cc606d04e5784644b8b26162c372eb0578a6c01f1c7e88e2bbd0bce0d0a27b5b9a034be361