!3 update version to 1.28

From: @guo-zhaorui 
Reviewed-by: @myeuler, @openeuler-basic 
Signed-off-by: @openeuler-basic, @myeuler
This commit is contained in:
openeuler-ci-bot 2022-03-30 10:20:40 +00:00 committed by Gitee
commit f1093d6f1f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 154 additions and 5 deletions

View File

@ -0,0 +1,59 @@
From dec44613883434fd522845393f1686514eb4dc83 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Mon, 27 Dec 2021 17:55:49 +0800
Subject: [PATCH] 1.27
---
Normalize.pm | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Normalize.pm b/Normalize.pm
index adf3db5..d06fb8b 100644
--- a/Normalize.pm
+++ b/Normalize.pm
@@ -16,7 +16,7 @@ use Carp;
no warnings 'utf8';
-our $VERSION = '1.26';
+our $VERSION = '1.27';
our $PACKAGE = __PACKAGE__;
our @EXPORT = qw( NFC NFD NFKC NFKD );
@@ -606,27 +606,27 @@ and/or modify it under the same terms as Perl itself.
=over 4
-=item http://www.unicode.org/reports/tr15/
+=item L<http://www.unicode.org/reports/tr15/>
Unicode Normalization Forms - UAX #15
-=item http://www.unicode.org/Public/UNIDATA/CompositionExclusions.txt
+=item L<http://www.unicode.org/Public/UNIDATA/CompositionExclusions.txt>
Composition Exclusion Table
-=item http://www.unicode.org/Public/UNIDATA/DerivedNormalizationProps.txt
+=item L<http://www.unicode.org/Public/UNIDATA/DerivedNormalizationProps.txt>
Derived Normalization Properties
-=item http://www.unicode.org/Public/UNIDATA/NormalizationCorrections.txt
+=item L<http://www.unicode.org/Public/UNIDATA/NormalizationCorrections.txt>
Normalization Corrections
-=item http://www.unicode.org/review/pr-29.html
+=item L<http://www.unicode.org/review/pr-29.html>
Public Review Issue #29: Normalization Issue
-=item http://www.unicode.org/notes/tn5/
+=item L<http://www.unicode.org/notes/tn5/>
Canonical Equivalence in Applications - UTN #5
--
2.27.0

View File

@ -0,0 +1,84 @@
From 99f15055f38ca3efeedc4c372d1f62100cfe58a1 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Mon, 27 Dec 2021 17:56:59 +0800
Subject: [PATCH] 1.28
---
Makefile.PL | 22 ++++++++++++----------
Normalize.pm | 2 +-
Normalize.xs | 2 +-
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/Makefile.PL b/Makefile.PL
index 18bc2e2..a848b0d 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,4 +1,6 @@
-require 5.006001;
+use strict;
+use warnings;
+
use ExtUtils::MakeMaker;
my $clean = {};
@@ -6,7 +8,7 @@ my $clean = {};
my $mm_ver = ExtUtils::MakeMaker->VERSION;
if (-f "Normalize.xs") {
- print STDERR "Making header files for XS...\n";
+ print "Making header files for XS...\n";
do './mkheader' or die $@ || "mkheader: $!";
@@ -29,14 +31,14 @@ WriteMakefile(
'clean' => $clean,
'depend' => { 'Normalize.o' => '$(H_FILES)' },
'PREREQ_PM' => {
- Carp => 0,
- constant => 0,
- DynaLoader => 0,
- Exporter => 0,
- File::Spec => 0,
- strict => 0,
- warnings => 0,
- SelectSaver => 0,
+ 'Carp' => 0,
+ 'constant' => 0,
+ 'DynaLoader' => 0,
+ 'Exporter' => 0,
+ 'File::Spec' => 0,
+ 'strict' => 0,
+ 'warnings' => 0,
+ 'SelectSaver' => 0,
},
($mm_ver < 6.48 ? () : MIN_PERL_VERSION => 5.6.0),
($mm_ver < 6.46 ? () : (META_MERGE => {
diff --git a/Normalize.pm b/Normalize.pm
index d06fb8b..fd6f1cb 100644
--- a/Normalize.pm
+++ b/Normalize.pm
@@ -16,7 +16,7 @@ use Carp;
no warnings 'utf8';
-our $VERSION = '1.27';
+our $VERSION = '1.28';
our $PACKAGE = __PACKAGE__;
our @EXPORT = qw( NFC NFD NFKC NFKD );
diff --git a/Normalize.xs b/Normalize.xs
index 4acff7f..0c151b7 100644
--- a/Normalize.xs
+++ b/Normalize.xs
@@ -23,7 +23,7 @@
/* The generated normalization tables since v5.20 are in native character set
* terms. Prior to that, they were in Unicode terms. So we use 'uvchr' for
* later perls, and redefine that to be 'uvuni' for earlier ones */
-#if PERL_VERSION < 20
+#if PERL_VERSION_LT(5,20,0)
# undef uvchr_to_utf8
# ifdef uvuni_to_utf8
# define uvchr_to_utf8 uvuni_to_utf8
--
2.27.0

View File

@ -1,12 +1,15 @@
%global base_name Unicode-Normalize %global base_version 1.26
Name: perl-Unicode-Normalize Name: perl-Unicode-Normalize
Version: 1.26 Version: 1.28
Release: 419 Release: 1
Summary: Unicode Normalization Forms Summary: Unicode Normalization Forms
License: GPL+ or Artistic License: GPL+ or Artistic
URL: https://metacpan.org/release/Unicode-Normalize URL: https://metacpan.org/release/Unicode-Normalize
Source0: https://cpan.metacpan.org/authors/id/K/KH/KHW/%{base_name}-%{version}.tar.gz Source0: https://cpan.metacpan.org/authors/id/K/KH/KHW/Unicode-Normalize-%{base_version}.tar.gz
Patch6000: backport-Update-1.27.patch
Patch6001: backport-Update-1.28.patch
BuildRequires: gcc findutils make perl-devel perl-generators perl-interpreter perl-libs BuildRequires: gcc findutils make perl-devel perl-generators perl-interpreter perl-libs
BuildRequires: perl(Carp) perl(constant) perl(ExtUtils::MakeMaker) >= 6.76 perl(File::Spec) BuildRequires: perl(Carp) perl(constant) perl(ExtUtils::MakeMaker) >= 6.76 perl(File::Spec)
@ -21,7 +24,7 @@ representation(Unicode Standard Annex #15).
%package_help %package_help
%prep %prep
%autosetup -n %{base_name}-%{version} %autosetup -n Unicode-Normalize-%{base_version} -p1
%build %build
perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 OPTIMIZE="%{optflags}" perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 OPTIMIZE="%{optflags}"
@ -52,6 +55,9 @@ make test
%{_mandir}/man3/* %{_mandir}/man3/*
%changelog %changelog
* Mon Dec 27 2021 guozhaorui<guozhaorui1@huawei.com> - 1.28-1
- update version to 1.28
* Fri Sep 27 2019 chengquan<chengquan3@huawei.com> - 1.26-419 * Fri Sep 27 2019 chengquan<chengquan3@huawei.com> - 1.26-419
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA