1.14 bump

This commit is contained in:
Petr Písař 2015-07-13 11:23:00 +02:00
parent 81eeeee30f
commit 1757cd211c
4 changed files with 7 additions and 55 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/Unicode-Collate-1.12.tar.gz
/Unicode-Collate-1.14.tar.gz

View File

@ -1,40 +0,0 @@
From 444b828e15fd7e507c283120e6bd88a264ae5b91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@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@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

View File

@ -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@redhat.com> - 1.14-1
- 1.14 bump
* Thu Jul 02 2015 Petr Pisar <ppisar@redhat.com> 1.12-348
- Specfile autogenerated by cpanspec 1.78.
- Run mklocale only if not bootstrapping

View File

@ -1 +1 @@
9eb22e6d7745d4d29b6753c79cbe5014 Unicode-Collate-1.12.tar.gz
c486b31f87bfa3875883f3c9fad9fd99 Unicode-Collate-1.14.tar.gz