ppisar pushed to perl-Unicode-Collate (master). "1.14 bump"

[notifications at fedoraproject.org]

From 1757cd211c53cad5ab5c21762672004e91b090ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
Date: Mon, 13 Jul 2015 11:23:00 +0200
Subject: 1.14 bump


diff --git a/.gitignore b/.gitignore
index 1c22400..93b56c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /Unicode-Collate-1.12.tar.gz
+/Unicode-Collate-1.14.tar.gz
diff --git a/Unicode-Collate-1.12-Create-Locale-directory-with-default-mask.patch b/Unicode-Collate-1.12-Create-Locale-directory-with-default-mask.patch
deleted file mode 100644
index e6650f1..0000000
--- a/Unicode-Collate-1.12-Create-Locale-directory-with-default-mask.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 444b828e15fd7e507c283120e6bd88a264ae5b91 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
-Date: Thu, 2 Jul 2015 16:06:11 +0200
-Subject: [PATCH] Create Locale directory with default mask
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Petr Písař <ppisar at redhat.com>
----
- mklocale | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mklocale b/mklocale
-index fc3f269..53b8a1c 100644
---- a/mklocale
-+++ b/mklocale
-@@ -511,7 +511,7 @@ my @txts = grep /^[a-zA-Z]/, readdir DIR;
- closedir DIR;
- 
- my $target = 'Locale';
--mkdir $target, 0666;
-+mkdir $target;
- for my $txt (@txts) {
-     my %locale_keys;
-     my $txtfile = File::Spec->catfile($source, $txt);
-@@ -519,8 +519,8 @@ for my $txt (@txts) {
-        $pl =~ s/\.txt\z/.pl/ or croak "$PACKAGE: $source/$txt is not .txt";
-     my $plfile = File::Spec->catfile($target, $pl);
- 
--    open my $fh,  $txtfile  or croak "$PACKAGE: $source/$txt is not found";
--    open my $ph, ">$plfile" or croak "$PACKAGE: $target/$pl can't be made";
-+    open my $fh,  $txtfile  or croak "$PACKAGE: $source/$txt is not found: $!";
-+    open my $ph, ">$plfile" or croak "$PACKAGE: $target/$pl can't be made: $!";
-     binmode $ph;
- 
-     my $ptxt  = '';
--- 
-2.4.3
-
diff --git a/perl-Unicode-Collate.spec b/perl-Unicode-Collate.spec
index 6c213d3..0397147 100644
--- a/perl-Unicode-Collate.spec
+++ b/perl-Unicode-Collate.spec
@@ -1,13 +1,11 @@
 Name:           perl-Unicode-Collate
-Version:        1.12
-Release:        348%{?dist}
+Version:        1.14
+Release:        1%{?dist}
 Summary:        Unicode Collation Algorithm
 License:        (GPL+ or Artistic) and UCD
 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
-# Fix mklocale script, CPAN RT#105621
-Patch0:         Unicode-Collate-1.12-Create-Locale-directory-with-default-mask.patch
 BuildRequires:  coreutils
 BuildRequires:  findutils
 BuildRequires:  make
@@ -17,11 +15,6 @@ BuildRequires:  perl(constant)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(File::Spec)
 BuildRequires:  perl(strict)
-%if !%{defined perl_bootstrap}
-# mklocale requires Korean.pm which uses Unicode::Collate, this is a cyclic
-# reflexive dependency, CPAN RT#105791
-BuildRequires:  perl(Unicode::Collate)
-%endif
 BuildRequires:  perl(warnings)
 # Run-time:
 BuildRequires:  perl(base)
@@ -37,21 +30,16 @@ Collation Algorithm).
 
 %prep
 %setup -q -n Unicode-Collate-%{version}
-%patch0 -p1
-%if !%{defined perl_bootstrap}
 # Remove pregenerated files
 rm Collate/Locale/*
 # Collate/CJK/Korean.pm is input for mklocale script, do not remove it here
-%endif
 
 %build
-%if !%{defined perl_bootstrap}
 # Regenerate code from Collate/allkeys.txt whose authority is
 # <http://www.unicode.org/Public/UCA/latest/allkeys.txt>
 perl mklocale
 mv Locale/*.pl Collate/Locale
 mv Korean.pm Collate/CJK
-%endif
 
 perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
 make %{?_smp_mflags}
@@ -72,6 +60,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jul 13 2015 Petr Pisar <ppisar at redhat.com> - 1.14-1
+- 1.14 bump
+
 * Thu Jul 02 2015 Petr Pisar <ppisar at redhat.com> 1.12-348
 - Specfile autogenerated by cpanspec 1.78.
 - Run mklocale only if not bootstrapping
diff --git a/sources b/sources
index 577a1bd..faa8642 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9eb22e6d7745d4d29b6753c79cbe5014  Unicode-Collate-1.12.tar.gz
+c486b31f87bfa3875883f3c9fad9fd99  Unicode-Collate-1.14.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/perl-Unicode-Collate.git/commit/?h=master&id=1757cd211c53cad5ab5c21762672004e91b090ad