From 7bc32be8ee0169ab767a4d10bc1dfa16313db889 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman <emman...@seyman.fr> Date: Sun, 27 Sep 2015 22:38:23 +0200 Subject: Update to 0.44
diff --git a/.gitignore b/.gitignore index 8070f33..1268c13 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ Module-Starter-Plugin-CGIApp-0.30.tar.gz /Module-Starter-Plugin-CGIApp-0.41.tar.gz /Module-Starter-Plugin-CGIApp-0.42.tar.gz +/Module-Starter-Plugin-CGIApp-0.44.tar.gz diff --git a/Module-Starter-Plugin-CGIApp-0.42-Adapt-to-Module-Starter-1.71.patch b/Module-Starter-Plugin-CGIApp-0.42-Adapt-to-Module-Starter-1.71.patch deleted file mode 100644 index 6bd3a1d..0000000 --- a/Module-Starter-Plugin-CGIApp-0.42-Adapt-to-Module-Starter-1.71.patch +++ /dev/null @@ -1,57 +0,0 @@ -From a1e8f3b6937be2c8c03de3dfb09ca53ca62be88a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com> -Date: Thu, 7 May 2015 13:37:53 +0200 -Subject: [PATCH] Adapt to Module-Starter-1.71 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Module-Starter 1.70 and 1.71 changed how test files are created. This -adjusts to the change. - -Filtering t/boilerplate.t from MANIFEST is a hack. I don't understand why -it's not created into xt directory. - -https://bugzilla.redhat.com/show_bug.cgi?id=1189463 -https://rt.cpan.org/Public/Bug/Display.html?id=101894 -https://github.com/xsawyerx/module-starter/issues/47#issuecomment-73425236 -Signed-off-by: Petr Písař <ppi...@redhat.com> ---- - lib/Module/Starter/Plugin/CGIApp.pm | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/lib/Module/Starter/Plugin/CGIApp.pm b/lib/Module/Starter/Plugin/CGIApp.pm -index cb0f1b7..f3aa37b 100644 ---- a/lib/Module/Starter/Plugin/CGIApp.pm -+++ b/lib/Module/Starter/Plugin/CGIApp.pm -@@ -125,7 +125,6 @@ sub create_distro { - push @files, $self->create_modules( @{ $self->{modules} } ); - - push @files, $self->create_t( @{ $self->{modules} } ); -- push @files, $self->create_xt( @{ $self->{modules} } ); - push @files, $self->create_tmpl(); - my %build_results = $self->create_build(); - push @files, @{ $build_results{files} }; -@@ -147,7 +146,7 @@ sub _create_manifest { - - my $file = File::Spec->catfile( $self->{basedir}, 'MANIFEST' ); - open my $fh, '>', $file or croak "Can't open file $file: $OS_ERROR\n"; -- foreach my $file ( sort @files ) { -+ foreach my $file ( grep !m{^\Qt/boilerplate.t\E$}, sort @files ) { - print {$fh} "$file\n" or croak "$OS_ERROR\n"; - } - close $fh or croak "Can't close file $file: $OS_ERROR\n"; -@@ -261,9 +260,7 @@ in the distribution. - sub create_t { - my ( $self, @modules ) = @_; - -- my %t_files = $self->t_guts(@modules); -- -- my @files = map { $self->_create_t( $_, $t_files{$_} ) } keys %t_files; -+ my @files = $self->SUPER::create_t(@modules); - - # This next part is for the static files dir t/www - my @dirparts = ( $self->{basedir}, 't', 'www' ); --- -2.1.0 - diff --git a/perl-Module-Starter-Plugin-CGIApp.spec b/perl-Module-Starter-Plugin-CGIApp.spec index c1d160f..d6a6f4b 100644 --- a/perl-Module-Starter-Plugin-CGIApp.spec +++ b/perl-Module-Starter-Plugin-CGIApp.spec @@ -1,13 +1,11 @@ Name: perl-Module-Starter-Plugin-CGIApp -Version: 0.42 -Release: 11%{?dist} +Version: 0.44 +Release: 1%{?dist} Summary: Template based module starter for CGI apps License: GPL+ or Artistic -Group: Development/Libraries + URL: http://search.cpan.org/dist/Module-Starter-Plugin-CGIApp/ Source0: http://www.cpan.org/authors/id/J/JA/JALDHAR/Module-Starter-Plugin-CGIApp-%{version}.tar.gz -# Adapt to changes in Module-Starter-1.71, bug #1189463, CPAN RT#101894 -Patch0: Module-Starter-Plugin-CGIApp-0.42-Adapt-to-Module-Starter-1.71.patch BuildArch: noarch BuildRequires: perl(File::Copy::Recursive) BuildRequires: perl(File::DirCompare) @@ -15,7 +13,6 @@ BuildRequires: perl(File::ShareDir) BuildRequires: perl(HTML::Template) BuildRequires: perl(Module::Build) BuildRequires: perl(Module::Signature) -# Constrain Module::Starter version due to bug #1189463 BuildRequires: perl(Module::Starter) >= 1.71 BuildRequires: perl(Pod::Coverage) >= 0.18 BuildRequires: perl(Test::Builder) @@ -40,7 +37,6 @@ CPAN. You can customize the output using HTML::Template. %prep %setup -q -n Module-Starter-Plugin-CGIApp-%{version} -%patch0 -p1 %build @@ -67,6 +63,10 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_mandir}/man3/* %changelog +* Sun Sep 27 2015 Emmanuel Seyman <emman...@seyman.fr> - 0.44-1 +- Update to 0.44 +- Remove partially-upstreamed patch + * Thu Jun 18 2015 Fedora Release Engineering <rel-...@lists.fedoraproject.org> - 0.42-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 0c042e1..9370ec3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bc0d6e991714bbaa3cb80956d2a42a6b Module-Starter-Plugin-CGIApp-0.42.tar.gz +d3a286e87c9ef1672a062cc1c2f86366 Module-Starter-Plugin-CGIApp-0.44.tar.gz -- cgit v0.10.2 http://pkgs.fedoraproject.org/cgit/perl-Module-Starter-Plugin-CGIApp.git/commit/?h=master&id=7bc32be8ee0169ab767a4d10bc1dfa16313db889 -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/perl-devel