commit 798e5a22449a30c4c7a61992ea1eaa40c26cc342 Author: Petr Písař <ppisar@xxxxxxxxxx> Date: Fri Aug 2 11:05:25 2013 +0200 0.27 bump .gitignore | 1 + Jemplate-0.27-Do-not-prune-INC.patch | 35 ++++++++++++++++ perl-Jemplate.spec | 74 +++++++++++++++++++++++++-------- sources | 2 +- 4 files changed, 93 insertions(+), 19 deletions(-) --- diff --git a/.gitignore b/.gitignore index 82a5c54..0e55a3f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ Jemplate-0.23.tar.gz Jemplate-0.261.tar.gz /Jemplate-0.262.tar.gz +/Jemplate-0.27.tar.gz diff --git a/Jemplate-0.27-Do-not-prune-INC.patch b/Jemplate-0.27-Do-not-prune-INC.patch new file mode 100644 index 0000000..a0c7251 --- /dev/null +++ b/Jemplate-0.27-Do-not-prune-INC.patch @@ -0,0 +1,35 @@ +From 616718c4d858a2209c3e6a75b12c2c428589864a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@xxxxxxxxxx> +Date: Fri, 2 Aug 2013 10:47:50 +0200 +Subject: [PATCH] Do not squash @INC +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Dual-lived modules can be in vendor or site path. + +Signed-off-by: Petr Písař <ppisar@xxxxxxxxxx> +--- + jemplate | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/jemplate b/jemplate +index b7a828b..6c8772b 100755 +--- a/jemplate ++++ b/jemplate +@@ -17,12 +17,6 @@ + # jemplate --help + + use Config; +-BEGIN { +- @INC = ( +- $Config::Config{archlib}, +- $Config::Config{privlib}, +- ); +-} + use strict; + use warnings; + +-- +1.8.1.4 + diff --git a/perl-Jemplate.spec b/perl-Jemplate.spec index 0e6ce8a..6b0a2aa 100644 --- a/perl-Jemplate.spec +++ b/perl-Jemplate.spec @@ -1,6 +1,9 @@ +%global cpan_version 0.27 + Name: perl-Jemplate -Version: 0.262 -Release: 5%{?dist} +# Keep 3-digit version for history +Version: %{cpan_version}0 +Release: 1%{?dist} # lib/Jemplate.pm -> GPL+ or Artistic # lib/Jemplate/Directive.pm -> GPL+ or Artistic # lib/Jemplate/Parser.pm -> GPL+ or Artistic @@ -9,21 +12,57 @@ Release: 5%{?dist} License: GPL+ or Artistic Group: Development/Libraries Summary: JavaScript Templating with Template Toolkit -Source: http://search.cpan.org/CPAN/authors/id/F/FR/FREW/Jemplate-%{version}.tar.gz -#Patch0: Jemplate.pm-0.23_1.patch -#Patch0: Jemplate-0.261-fix-quoted-test.patch +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 Url: http://search.cpan.org/dist/Jemplate BuildArch: noarch +BuildRequires: perl BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42 +BuildRequires: perl(strict) +# inc::Module::Package is bundled: +BuildRequires: perl(Cwd) +BuildRequires: perl(ExtUtils::Manifest) +BuildRequires: perl(ExtUtils::MM_Unix) +BuildRequires: perl(Fcntl) +BuildRequires: perl(FindBin) # Run-time: BuildRequires: perl(base) +BuildRequires: perl(bytes) +BuildRequires: perl(Carp) +BuildRequires: perl(Config) +BuildRequires: perl(constant) +BuildRequires: perl(Encode) +BuildRequires: perl(Exporter) +BuildRequires: perl(File::Basename) +BuildRequires: perl(File::Find) +# File::Find::Rule is bundled BuildRequires: perl(File::Find::Rule) >= 0.30 +BuildRequires: perl(File::Path) +BuildRequires: perl(File::Spec) +BuildRequires: perl(File::Temp) BuildRequires: perl(Getopt::Long) +# Number::Compare is bundled +BuildRequires: perl(overload) +BuildRequires: perl(Scalar::Util) BuildRequires: perl(Template) >= 2.14 +# Template is bundled +# Template::Base is bundled +# Template::Config is bundled +# Template::Constants is bundled +# Template::Directive is bundled +# Template::Document is bundled +# Template::Exception is bundled +# Template::Grammar is bundled +# Template::Parser is bundled +# Template::Provider is bundled +# Template::Service is bundled +# Template::TieString is bundled +# Text::Glob is bundled +BuildRequires: perl(vars) +BuildRequires: perl(warnings) # Tests -BuildRequires: perl(constant) -BuildRequires: perl(File::Spec) BuildRequires: perl(Filter::Util::Call) BuildRequires: perl(HTTP::Daemon) BuildRequires: perl(HTTP::Status) @@ -40,7 +79,7 @@ BuildRequires: perl(YAML) # Optional tests #BuildRequires: perl(JavaScript::V8x::TestMoreish) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(File::Find::Rule) >= 0.30 %description @@ -51,27 +90,23 @@ into Perl code, it compiles them into JavaScript. Jemplate then provides a JavaScript run-time module for processing the template code. Presto, we have full featured JavaScript templating language! - - %prep -%setup -q -n Jemplate-%{version} -#%%patch0 -p1 -# Fix bug RT#75769 -rm bin/README -sed -i -e '/bin\/README/d' MANIFEST +%setup -q -n Jemplate-%{cpan_version} +%patch0 -p1 +rm -rf inc/Test inc/Spiffy.pm +sed -i -e '/^inc\/Test\//d' -e '/^inc\/Spiffy\.pm/d' MANIFEST cat doc/text/Jemplate.text | iconv -f iso-8859-1 -t utf-8 > foo cat foo > doc/text/Jemplate.text rm foo %build -%{__perl} Makefile.PL INSTALLDIRS=vendor +perl Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install -make pure_install PERL_INSTALL_ROOT=%{buildroot} +make pure_install DESTDIR=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' -find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} %{buildroot}/* %check @@ -85,6 +120,9 @@ make test %{_mandir}/man1/jemplate.1.gz %changelog +* Fri Aug 02 2013 Petr Pisar <ppisar@xxxxxxxxxx> - 0.270-1 +- 0.27 bump + * Fri Aug 02 2013 Petr Pisar <ppisar@xxxxxxxxxx> - 0.262-5 - Perl 5.18 rebuild diff --git a/sources b/sources index 3374bf8..d0614e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1e7c5111807e0fef3dda8636b2fa6362 Jemplate-0.262.tar.gz +f095677a0c59955e07bfe8ee309b86aa Jemplate-0.27.tar.gz -- 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