diff --git a/.gitignore b/.gitignore index fb39cd2..0d1ca63 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /Unicode-Collate-1.18.tar.gz /Unicode-Collate-1.19.tar.gz /Unicode-Collate-1.20.tar.gz +/Unicode-Collate-1.21.tar.gz 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 deleted file mode 100644 index ceed739..0000000 --- a/Unicode-Collate-1.20-Fixes-for-removal-dot-from-INC.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 9f95a82..f14db7b 100644 --- a/perl-Unicode-Collate.spec +++ b/perl-Unicode-Collate.spec @@ -1,5 +1,5 @@ Name: perl-Unicode-Collate -Version: 1.20 +Version: 1.21 Release: 1%{?dist} Summary: Unicode Collation Algorithm # Collate/allkeys.txt: Unicode (the file contains a link to @@ -9,14 +9,12 @@ 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 -# 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 -BuildRequires: perl-interpreter BuildRequires: perl-devel BuildRequires: perl-generators +BuildRequires: perl-interpreter BuildRequires: perl(Carp) BuildRequires: perl(constant) BuildRequires: perl(ExtUtils::MakeMaker) @@ -37,7 +35,6 @@ Collation Algorithm). %prep %setup -q -n Unicode-Collate-%{version} -%patch0 -p1 # Remove pregenerated files rm Collate/Locale/* @@ -69,6 +66,9 @@ make test %{_mandir}/man3/* %changelog +* Mon Nov 06 2017 Petr Pisar - 1.21-1 +- 1.21 bump + * Fri Nov 03 2017 Petr Pisar - 1.20-1 - 1.20 bump diff --git a/sources b/sources index 9b877cf..7361d2f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Unicode-Collate-1.20.tar.gz) = a0bc62e087f453c3146c1274b3c821ff6f029619d52fbdfe0357e7cc606d04e5784644b8b26162c372eb0578a6c01f1c7e88e2bbd0bce0d0a27b5b9a034be361 +SHA512 (Unicode-Collate-1.21.tar.gz) = a603d7affb60c4064325ee7a409570d40787e1fe9f50310fb6a1a1f6fe51d92a7ce398edfbb6fc708e48cb0eff1c5afc03695ea07d37a6c9bbb63e7eb104aa54