- add split_pattern.patch from RT#84778 to fix build with perl 5.18
OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-Template-Toolkit?expand=0&rev=25
This commit is contained in:
parent
87d4fa778a
commit
c5eac02ac4
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 26 09:52:09 UTC 2013 - coolo@suse.com
|
||||
|
||||
- add split_pattern.patch from RT#84778 to fix build with perl 5.18
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 10 02:35:25 UTC 2012 - vcizek@suse.com
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package perl-Template-Toolkit
|
||||
#
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -16,18 +16,19 @@
|
||||
#
|
||||
|
||||
|
||||
|
||||
Name: perl-Template-Toolkit
|
||||
Version: 2.24
|
||||
Release: 0
|
||||
License: Artistic-1.0
|
||||
Summary: Template Processing System
|
||||
Url: http://cpan.org/dist/Template-Toolkit
|
||||
License: Artistic-1.0
|
||||
Group: Development/Libraries/Perl
|
||||
Url: http://cpan.org/dist/Template-Toolkit
|
||||
Source: http://search.cpan.org/CPAN/authors/id/A/AB/ABW/Template-Toolkit-%{version}.tar.gz
|
||||
Patch0: https://rt.cpan.org/Public/Ticket/Attachment/1204402/635952/split_pattern.patch
|
||||
#BuildRequires: perl-AppConfig perl-DBI perl-Date-Calc perl-XML-DOM perl-XML-Parser
|
||||
BuildRequires: perl
|
||||
#
|
||||
BuildRequires: perl-macros
|
||||
BuildRequires: perl(AppConfig) >= 1.56
|
||||
BuildRequires: perl(DBI)
|
||||
BuildRequires: perl(Date::Calc)
|
||||
@ -40,7 +41,6 @@ BuildRequires: perl(Test::Pod) >= 1.00
|
||||
BuildRequires: perl(Test::Pod::Coverage) >= 1.00
|
||||
BuildRequires: perl(Text::Autoformat)
|
||||
BuildRequires: perl(XML::DOM)
|
||||
BuildRequires: perl-macros
|
||||
#
|
||||
Requires: perl(AppConfig) >= 1.56
|
||||
# not defined but needed
|
||||
@ -69,6 +69,7 @@ other offline document systems.
|
||||
|
||||
%prep
|
||||
%setup -q -n "Template-Toolkit-%{version}"
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
perl Makefile.PL
|
||||
|
28
split_pattern.patch
Normal file
28
split_pattern.patch
Normal file
@ -0,0 +1,28 @@
|
||||
--- a/lib/Template/VMethods.pm 2012-02-07 09:06:38.000000000 +0000
|
||||
+++ b/lib/Template/VMethods.pm 2013-04-22 16:58:34.000000000 +0000
|
||||
@@ -261,12 +261,12 @@
|
||||
|
||||
if (defined $limit) {
|
||||
return [ defined $split
|
||||
- ? split($split, $str, $limit)
|
||||
+ ? split("(?:)".$split, $str, $limit)
|
||||
: split(' ', $str, $limit) ];
|
||||
}
|
||||
else {
|
||||
return [ defined $split
|
||||
- ? split($split, $str)
|
||||
+ ? split("(?:)".$split, $str)
|
||||
: split(' ', $str) ];
|
||||
}
|
||||
}
|
||||
--- a/lib/Template/Plugin/String.pm 2011-12-20 07:41:35.000000000 +0000
|
||||
+++ b/lib/Template/Plugin/String.pm 2013-04-22 16:55:36.000000000 +0000
|
||||
@@ -363,7 +363,7 @@
|
||||
my $split = CORE::shift;
|
||||
my $limit = CORE::shift || 0;
|
||||
$split = '\s+' unless defined $split;
|
||||
- return [ split($split, $self->{ text }, $limit) ];
|
||||
+ return [ split("(?:)".$split, $self->{ text }, $limit) ];
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user