commit 02f7eb991ae29ef781a32087bb28d4cc0c43eca9
Author: Jitka Plesnikova <jplesnik@xxxxxxxxxx>
Date: Mon Sep 2 09:04:24 2013 +0200
Fix RT#87566
Jemplate-0.27-Fix_macro_t.patch | 17 +++++++++++++++++
perl-Jemplate.spec | 8 +++++++-
2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/Jemplate-0.27-Fix_macro_t.patch b/Jemplate-0.27-Fix_macro_t.patch
new file mode 100644
index 0000000..8eb4136
--- /dev/null
+++ b/Jemplate-0.27-Fix_macro_t.patch
@@ -0,0 +1,17 @@
+diff -up Jemplate-0.27/t/macro.t.orig Jemplate-0.27/t/macro.t
+--- Jemplate-0.27/t/macro.t.orig 2013-08-30 16:04:44.490408686 +0200
++++ Jemplate-0.27/t/macro.t 2013-09-02 08:04:43.968793401 +0200
+@@ -13,11 +13,9 @@ __END__
+
+ ===
+ --- macro_definition
+-[%
+- MACRO simple(param1,param2) BLOCK;
++[% MACRO simple(param1,param2) BLOCK;
+ param1 _ param2;
+- END;
+-%]
++ END; %]
+ --- js -trim
+ //line 1 "test_template"
+
diff --git a/perl-Jemplate.spec b/perl-Jemplate.spec
index 6b0a2aa..e2a2faa 100644
--- a/perl-Jemplate.spec
+++ b/perl-Jemplate.spec
@@ -3,7 +3,7 @@
Name: perl-Jemplate
# Keep 3-digit version for history
Version: %{cpan_version}0
-Release: 1%{?dist}
+Release: 2%{?dist}
# lib/Jemplate.pm -> GPL+ or Artistic
# lib/Jemplate/Directive.pm -> GPL+ or Artistic
# lib/Jemplate/Parser.pm -> GPL+ or Artistic
@@ -15,6 +15,8 @@ Summary: JavaScript Templating with Template Toolkit
Source: http://search.cpan.org/CPAN/authors/id/I/IN/INGY/Jemplate-%{cpan_version}.tar.gz
# Do not prune INC, CPAN RT#87546
Patch0: Jemplate-0.27-Do-not-prune-INC.patch
+# Fix test macro.t, CPAN RT#87566
+Patch1: Jemplate-0.27-Fix_macro_t.patch
Url: http://search.cpan.org/dist/Jemplate
BuildArch: noarch
@@ -93,6 +95,7 @@ have full featured JavaScript templating language!
%prep
%setup -q -n Jemplate-%{cpan_version}
%patch0 -p1
+%patch1 -p1
rm -rf inc/Test inc/Spiffy.pm
sed -i -e '/^inc\/Test\//d' -e '/^inc\/Spiffy\.pm/d' MANIFEST
@@ -120,6 +123,9 @@ make test
%{_mandir}/man1/jemplate.1.gz
%changelog
+* Fri Aug 30 2013 Jitka Plesnikova <jplesnik@xxxxxxxxxx> - 0.270-2
+- Fix the macro.t to work with new Template::Parser
+
* Fri Aug 02 2013 Petr Pisar <ppisar@xxxxxxxxxx> - 0.270-1
- 0.27 bump
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
