Compare commits

..

No commits in common. "stream-perl-bootstrap-5.24-rhel-8.9.0" and "c8-stream-5.3" have entirely different histories.

5 changed files with 53 additions and 50 deletions

3
.gitignore vendored
View File

@ -1,2 +1 @@
SOURCES/Unicode-Collate-1.20.tar.gz SOURCES/Unicode-Collate-1.27.tar.gz
/Unicode-Collate-1.20.tar.gz

View File

@ -0,0 +1 @@
cecde0a8c2b41745a309489839e36c8d8ea26a1f SOURCES/Unicode-Collate-1.27.tar.gz

View File

@ -1,32 +1,30 @@
Name: perl-Unicode-Collate Name: perl-Unicode-Collate
Version: 1.20 Version: 1.27
Release: 2%{?dist} Release: 439%{?dist}
Summary: Unicode Collation Algorithm Summary: Unicode Collation Algorithm
# Collate/allkeys.txt: Unicode (the file contains a link to # Collate/allkeys.txt: Unicode (the file contains a link to
# <http://www.unicode.org/terms_of_use.html>) # <http://www.unicode.org/terms_of_use.html>)
# other files: GPL+ or Artistic # other files: GPL+ or Artistic
License: (GPL+ or Artistic) and Unicode License: (GPL+ or Artistic) and Unicode
Group: Development/Libraries URL: https://metacpan.org/release/Unicode-Collate
URL: http://search.cpan.org/dist/Unicode-Collate/ Source0: https://cpan.metacpan.org/authors/id/S/SA/SADAHIRO/Unicode-Collate-%{version}.tar.gz
Source0: http://www.cpan.org/authors/id/S/SA/SADAHIRO/Unicode-Collate-%{version}.tar.gz BuildRequires: coreutils
# Adapt to Perl without "." im @INC, CPAN RT#121664
Patch0: Unicode-Collate-1.20-Fixes-for-removal-dot-from-INC.patch
BuildRequires: gcc BuildRequires: gcc
BuildRequires: findutils BuildRequires: findutils
BuildRequires: make BuildRequires: make
BuildRequires: perl-interpreter
BuildRequires: perl-devel BuildRequires: perl-devel
BuildRequires: perl-generators BuildRequires: perl-generators
BuildRequires: perl-interpreter
BuildRequires: perl(Carp) BuildRequires: perl(Carp)
BuildRequires: perl(constant) BuildRequires: perl(constant)
BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76
BuildRequires: perl(File::Spec) BuildRequires: perl(File::Spec)
BuildRequires: perl(strict) BuildRequires: perl(strict)
BuildRequires: perl(warnings) BuildRequires: perl(warnings)
# Run-time: # Run-time:
BuildRequires: perl(base) BuildRequires: perl(base)
BuildRequires: perl(DynaLoader)
BuildRequires: perl(Unicode::Normalize) BuildRequires: perl(Unicode::Normalize)
BuildRequires: perl(XSLoader)
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
Requires: perl(Unicode::Normalize) Requires: perl(Unicode::Normalize)
Conflicts: perl < 4:5.22.0-347 Conflicts: perl < 4:5.22.0-347
@ -37,11 +35,10 @@ Collation Algorithm).
%prep %prep
%setup -q -n Unicode-Collate-%{version} %setup -q -n Unicode-Collate-%{version}
%patch0 -p1
# Remove pregenerated files # Remove pregenerated files
rm Collate/Locale/* rm Collate/Locale/*
# Collate/CJK/Korean.pm is input for mklocale script, do not remove it here # Collate/CJK/Korean.pm is an input for the mklocale script, do not remove it
%build %build
# Regenerate code from Collate/allkeys.txt whose authority is # Regenerate code from Collate/allkeys.txt whose authority is
@ -50,12 +47,11 @@ perl mklocale
mv Locale/*.pl Collate/Locale mv Locale/*.pl Collate/Locale
mv Korean.pm Collate/CJK mv Korean.pm Collate/CJK
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
make pure_install DESTDIR=$RPM_BUILD_ROOT make pure_install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -delete
find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -delete find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -delete
%{_fixperms} $RPM_BUILD_ROOT/* %{_fixperms} $RPM_BUILD_ROOT/*
@ -69,12 +65,51 @@ make test
%{_mandir}/man3/* %{_mandir}/man3/*
%changelog %changelog
* Fri Mar 29 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.20-2 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.27-439
- Rebuild with enable hardening (bug #1636329) - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.27-438
- Increase release to favour standalone package
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.27-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jan 03 2019 Petr Pisar <ppisar@redhat.com> - 1.27-1
- 1.27 bump
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-417
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1.25-416
- Increase release to favour standalone package
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Nov 23 2017 Petr Pisar <ppisar@redhat.com> - 1.25-1
- 1.25 bump
* Tue Nov 21 2017 Petr Pisar <ppisar@redhat.com> - 1.24-1
- 1.24 bump
* Mon Nov 13 2017 Petr Pisar <ppisar@redhat.com> - 1.23-1
- 1.23 bump
* Mon Nov 06 2017 Petr Pisar <ppisar@redhat.com> - 1.21-1
- 1.21 bump
* Fri Nov 03 2017 Petr Pisar <ppisar@redhat.com> - 1.20-1 * Fri Nov 03 2017 Petr Pisar <ppisar@redhat.com> - 1.20-1
- 1.20 bump - 1.20 bump
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.19-395
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.19-394
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Jun 03 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1.19-393
- Perl 5.26 rebuild
* Mon May 15 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1.19-3 * Mon May 15 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1.19-3
- Fixes for removal '.' from @INC in Perl 5.26 - Fixes for removal '.' from @INC in Perl 5.26

View File

@ -1,31 +0,0 @@
From 1538096643d1197db700fe16969a47ecddfaac99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
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ř <ppisar@redhat.com>
---
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

View File

@ -1 +0,0 @@
SHA512 (Unicode-Collate-1.20.tar.gz) = a0bc62e087f453c3146c1274b3c821ff6f029619d52fbdfe0357e7cc606d04e5784644b8b26162c372eb0578a6c01f1c7e88e2bbd0bce0d0a27b5b9a034be361