Accepting request 186018 from devel:languages:perl

- update to 2.25 upstreaming split_pattern.patch
  * Jon Jensen fixed the behaviour of split() which changed in Perl 5.18.0
  * Jay Hannah added repository information for metacpan.org et. al. 
  * Colin Keith fixed Template::Provider's handling of directories
  * Kevin Goess made the date plugin accept the ISO8601 "T" separator
  * David Steinbrunner fixed various typos.
  * Andreas Koenig silenced recent Pod::Simple warnings
  * Slaven Rezic silenced warnings in the replace vmethod.
  * Ricardo Signes made the Image plugin emit extra tags in a predictable order
  * Johan Vromans added the --link option to ttree.
  * Smylers added documentation for the ENCODING option.
  * Andy Wardley made some minor documentation changes relating to github.

OBS-URL: https://build.opensuse.org/request/show/186018
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/perl-Template-Toolkit?expand=0&rev=27
This commit is contained in:
Tomáš Chvátal 2013-08-13 08:17:42 +00:00 committed by Git OBS Bridge
commit 2d3607c3ed
5 changed files with 23 additions and 40 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:38834aa8c249f7b7fb8b7238f086a08947ea7d472d78f1f5e2b9f3dbf49d01c8
size 499410

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f423763b01604dcf27902cc6fdb22a6d1e5d3f2f72044fd9e83123220f781e11
size 501038

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Tue Jul 30 05:06:51 UTC 2013 - coolo@suse.com
- update to 2.25 upstreaming split_pattern.patch
* Jon Jensen fixed the behaviour of split() which changed in Perl 5.18.0
* Jay Hannah added repository information for metacpan.org et. al.
* Colin Keith fixed Template::Provider's handling of directories
* Kevin Goess made the date plugin accept the ISO8601 "T" separator
* David Steinbrunner fixed various typos.
* Andreas Koenig silenced recent Pod::Simple warnings
* Slaven Rezic silenced warnings in the replace vmethod.
* Ricardo Signes made the Image plugin emit extra tags in a predictable order
* Johan Vromans added the --link option to ttree.
* Smylers added documentation for the ENCODING option.
* Andy Wardley made some minor documentation changes relating to github.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 26 09:52:09 UTC 2013 - coolo@suse.com Wed Jun 26 09:52:09 UTC 2013 - coolo@suse.com

View File

@ -17,14 +17,13 @@
Name: perl-Template-Toolkit Name: perl-Template-Toolkit
Version: 2.24 Version: 2.25
Release: 0 Release: 0
Summary: Template Processing System Summary: Template Processing System
License: Artistic-1.0 License: Artistic-1.0 or GPL-1.0+
Group: Development/Libraries/Perl Group: Development/Libraries/Perl
Url: http://cpan.org/dist/Template-Toolkit Url: http://cpan.org/dist/Template-Toolkit
Source: http://search.cpan.org/CPAN/authors/id/A/AB/ABW/Template-Toolkit-%{version}.tar.gz 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-AppConfig perl-DBI perl-Date-Calc perl-XML-DOM perl-XML-Parser
BuildRequires: perl BuildRequires: perl
# #
@ -69,11 +68,10 @@ other offline document systems.
%prep %prep
%setup -q -n "Template-Toolkit-%{version}" %setup -q -n "Template-Toolkit-%{version}"
%patch0 -p1
%build %build
perl Makefile.PL %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
make %{?_smp_mflags} %{__make} %{?_smp_mflags}
%check %check
make test make test
@ -83,9 +81,6 @@ make test
%perl_process_packlist %perl_process_packlist
%perl_gen_filelist %perl_gen_filelist
%clean
rm -rf %{buildroot}
%files -f %{name}.files %files -f %{name}.files
# normally you only need to check for doc files # normally you only need to check for doc files
%defattr(-,root,root) %defattr(-,root,root)

View File

@ -1,28 +0,0 @@
--- 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) ];
}