Compare commits

...

No commits in common. "c8-stream-5.3" and "c8-beta-stream-5.24" have entirely different histories.

4 changed files with 49 additions and 53 deletions

2
.gitignore vendored
View File

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

View File

@ -1 +1 @@
cecde0a8c2b41745a309489839e36c8d8ea26a1f SOURCES/Unicode-Collate-1.27.tar.gz
af776d86aae8f3ea3bf2dd6e570621ee0c7940cf SOURCES/Unicode-Collate-1.20.tar.gz

View File

@ -0,0 +1,31 @@
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,30 +1,32 @@
Name: perl-Unicode-Collate
Version: 1.27
Release: 439%{?dist}
Version: 1.20
Release: 2%{?dist}
Summary: Unicode Collation Algorithm
# Collate/allkeys.txt: Unicode (the file contains a link to
# <http://www.unicode.org/terms_of_use.html>)
# other files: GPL+ or Artistic
License: (GPL+ or Artistic) and Unicode
URL: https://metacpan.org/release/Unicode-Collate
Source0: https://cpan.metacpan.org/authors/id/S/SA/SADAHIRO/Unicode-Collate-%{version}.tar.gz
BuildRequires: coreutils
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) >= 6.76
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(File::Spec)
BuildRequires: perl(strict)
BuildRequires: perl(warnings)
# Run-time:
BuildRequires: perl(base)
BuildRequires: perl(DynaLoader)
BuildRequires: perl(Unicode::Normalize)
BuildRequires: perl(XSLoader)
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
Requires: perl(Unicode::Normalize)
Conflicts: perl < 4:5.22.0-347
@ -35,10 +37,11 @@ Collation Algorithm).
%prep
%setup -q -n Unicode-Collate-%{version}
%patch0 -p1
# Remove pregenerated files
rm Collate/Locale/*
# Collate/CJK/Korean.pm is an input for the mklocale script, do not remove it
# Collate/CJK/Korean.pm is input for mklocale script, do not remove it here
%build
# Regenerate code from Collate/allkeys.txt whose authority is
@ -47,11 +50,12 @@ perl mklocale
mv Locale/*.pl Collate/Locale
mv Korean.pm Collate/CJK
perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 OPTIMIZE="$RPM_OPT_FLAGS"
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}
%install
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
%{_fixperms} $RPM_BUILD_ROOT/*
@ -65,51 +69,12 @@ make test
%{_mandir}/man3/*
%changelog
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.27-439
- 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 Mar 29 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.20-2
- Rebuild with enable hardening (bug #1636329)
* Fri Nov 03 2017 Petr Pisar <ppisar@redhat.com> - 1.20-1
- 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
- Fixes for removal '.' from @INC in Perl 5.26