eseyman pushed to perl-CGI-Application-Structured-Tools (master). "Apply patch to adapt to Module::Starter 1.71 and clean up spec file"

[notifications at fedoraproject.org]

From a29f2dbd5fe6f8c1b8e1c4a334e721cf717bea0c Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emmanuel at seyman.fr>
Date: Thu, 20 Aug 2015 15:17:27 +0200
Subject: Apply patch to adapt to Module::Starter 1.71 and clean up spec file


diff --git a/CGI-Application-Structured-Tools-0.015-Adapt-to-Module-Starter-1.71.patch b/CGI-Application-Structured-Tools-0.015-Adapt-to-Module-Starter-1.71.patch
new file mode 100644
index 0000000..a81517f
--- /dev/null
+++ b/CGI-Application-Structured-Tools-0.015-Adapt-to-Module-Starter-1.71.patch
@@ -0,0 +1,29 @@
+diff -up ./lib/CGI/Application/Structured/Tools/Starter.pm.orig ./lib/CGI/Application/Structured/Tools/Starter.pm
+--- ./lib/CGI/Application/Structured/Tools/Starter.pm.orig	2015-08-20 12:42:45.029820837 +0200
++++ ./lib/CGI/Application/Structured/Tools/Starter.pm	2015-08-20 12:44:12.274294867 +0200
+@@ -160,7 +160,9 @@ sub create_distro {
+ 	my @files2 = 
+ 	my $file = File::Spec->catfile( $self->{basedir}, 'MANIFEST' );
+ 	open my $fh, '>', $file or die "Can't open file $file: $!\n";
+-	map{print $fh "$_\n"} grep { $_ ne 't/boilerplate.t' } @files;    
++        foreach my $file ( grep !m{^\Qt/boilerplate.t\E$}, sort @files ) {
++            print {$fh} "$file\n" or croak "$OS_ERROR\n";
++        }
+ 	close $fh or die "Can't close file $file: $!\n";	
+ 			    }
+ 	);
+@@ -184,13 +186,7 @@ sub create_t {
+     #
+     # 
+     #
+-    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' );
diff --git a/perl-CGI-Application-Structured-Tools.spec b/perl-CGI-Application-Structured-Tools.spec
index 2775771..016289e 100644
--- a/perl-CGI-Application-Structured-Tools.spec
+++ b/perl-CGI-Application-Structured-Tools.spec
@@ -1,15 +1,16 @@
 Name:           perl-CGI-Application-Structured-Tools
 Version:        0.015
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Tools to generate and maintain CGI::Application::Structured based web apps
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/CGI-Application-Structured-Tools/
 Source0:        http://www.cpan.org/authors/id/V/VA/VANAMBURG/CGI-Application-Structured-Tools-%{version}.tar.gz
+Patch0:         CGI-Application-Structured-Tools-0.015-Adapt-to-Module-Starter-1.71.patch
 BuildArch:      noarch
 BuildRequires:  perl(CGI::Application::Structured)
 BuildRequires:  perl(DBIx::Class::Schema::Loader)
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
 BuildRequires:  perl(File::Slurp)
 BuildRequires:  perl(HTML::Template)
 BuildRequires:  perl(Module::Signature)
@@ -38,6 +39,7 @@ and helper scripts to provide a rapid development environment.
 
 %prep
 %setup -q -n CGI-Application-Structured-Tools-%{version}
+%patch0
 
 cat << \EOF > %{name}-req
 #!/bin/sh
@@ -63,28 +65,30 @@ chmod 644 index.tmpl config-dev.pl
 sed -i -e '1i#!/usr/bin/perl' server.pl
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+%{__perl} Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
 make %{?_smp_mflags}
 
 %install
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
+make pure_install DESTDIR=$RPM_BUILD_ROOT
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
 make test
 
 %files
-%doc Changes LICENSE README Todo
+%doc Changes README Todo
+%license LICENSE
 %{perl_vendorlib}/*
 %{_mandir}/man1/*
 %{_mandir}/man3/*
 %{_bindir}/cas-starter.pl
 
 %changelog
+* Thu Aug 20 2015 Emmanuel Seyman <emmanuel at seyman.fr> - 0.015-10
+- Apply patch to adapt to Module::Starter 1.71 (#1195343)
+- Clean up spec file
+- Use %%license tag
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.015-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/perl-CGI-Application-Structured-Tools.git/commit/?h=master&id=a29f2dbd5fe6f8c1b8e1c4a334e721cf717bea0c