From 5203d5c881c12492383bb43f22b7023edb58f25f9a1f0cb913d4ab3456168e2f Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sun, 24 Sep 2017 06:55:52 +0000 Subject: [PATCH 1/2] - add no-dot-inc.patch to compile with perl 5.26 (https://rt.cpan.org/Public/Bug/Display.html?id=121664) OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-Unicode-Collate?expand=0&rev=18 --- cpanspec.yml | 5 ++--- no-dot-inc.patch | 13 +++++++++++++ perl-Unicode-Collate.changes | 6 ++++++ perl-Unicode-Collate.spec | 6 ++++-- 4 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 no-dot-inc.patch diff --git a/cpanspec.yml b/cpanspec.yml index 9b7ec50..a1fdcda 100644 --- a/cpanspec.yml +++ b/cpanspec.yml @@ -4,9 +4,8 @@ #sources: # - source1 # - source2 -#patches: -# foo.patch: -p1 -# bar.patch: +patches: + no-dot-inc.patch: -p1 #preamble: |- # BuildRequires: gcc-c++ #post_prep: |- diff --git a/no-dot-inc.patch b/no-dot-inc.patch new file mode 100644 index 0000000..5cd210b --- /dev/null +++ b/no-dot-inc.patch @@ -0,0 +1,13 @@ +Index: Unicode-Collate-1.19/Makefile.PL +=================================================================== +--- Unicode-Collate-1.19.orig/Makefile.PL ++++ Unicode-Collate-1.19/Makefile.PL +@@ -3,6 +3,8 @@ use ExtUtils::MakeMaker; + + my $clean = {}; + ++use lib q[.]; ++ + if (-f "Collate.xs") { + print "Making header files for XS...\n"; + diff --git a/perl-Unicode-Collate.changes b/perl-Unicode-Collate.changes index ad91b11..0b02d7d 100644 --- a/perl-Unicode-Collate.changes +++ b/perl-Unicode-Collate.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Sep 24 06:55:18 UTC 2017 - coolo@suse.com + +- add no-dot-inc.patch to compile with perl 5.26 + (https://rt.cpan.org/Public/Bug/Display.html?id=121664) + ------------------------------------------------------------------- Sat Dec 3 07:23:47 UTC 2016 - coolo@suse.com diff --git a/perl-Unicode-Collate.spec b/perl-Unicode-Collate.spec index 70756a3..0ceba97 100644 --- a/perl-Unicode-Collate.spec +++ b/perl-Unicode-Collate.spec @@ -1,7 +1,7 @@ # # spec file for package perl-Unicode-Collate # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,8 +24,9 @@ Summary: Unicode Collation Algorithm License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Unicode-Collate/ -Source0: http://www.cpan.org/authors/id/S/SA/SADAHIRO/%{cpan_name}-%{version}.tar.gz +Source0: https://cpan.metacpan.org/authors/id/S/SA/SADAHIRO/%{cpan_name}-%{version}.tar.gz Source1: cpanspec.yml +Patch0: no-dot-inc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros @@ -37,6 +38,7 @@ UTS #10) - Unicode Collation Algorithm (a.k.a. UCA). %prep %setup -q -n %{cpan_name}-%{version} +%patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" From bb01dfe0fa18c41cd39a0f10be94c1d5023caa502b313ad62b3d74ebe88486ca Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sun, 24 Sep 2017 06:57:04 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-Unicode-Collate?expand=0&rev=19 --- no-dot-inc.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/no-dot-inc.patch b/no-dot-inc.patch index 5cd210b..fc068a2 100644 --- a/no-dot-inc.patch +++ b/no-dot-inc.patch @@ -2,12 +2,12 @@ Index: Unicode-Collate-1.19/Makefile.PL =================================================================== --- Unicode-Collate-1.19.orig/Makefile.PL +++ Unicode-Collate-1.19/Makefile.PL -@@ -3,6 +3,8 @@ use ExtUtils::MakeMaker; - - my $clean = {}; - -+use lib q[.]; -+ +@@ -6,7 +6,7 @@ my $clean = {}; if (-f "Collate.xs") { print "Making header files for XS...\n"; +- do 'mkheader' or die $@ || "mkheader: $!"; ++ do './mkheader' or die $@ || "mkheader: $!"; + + $clean = { FILES => 'ucatbl.h' }; + }