From a9258456243ccf4abbc8b1ed2f2ba81c7377d42e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <[email protected]> Date: Mon, 30 Nov 2015 14:37:27 +0100 Subject: Restore compatibility with App-Cmd-0.328
--- ...-Restore-compatibility-with-App-Cmd-0.328.patch | 59 ++++++++++++++++++++++ perl-MouseX-App-Cmd.spec | 10 +++- 2 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 MouseX-App-Cmd-0.30-Restore-compatibility-with-App-Cmd-0.328.patch diff --git a/MouseX-App-Cmd-0.30-Restore-compatibility-with-App-Cmd-0.328.patch b/MouseX-App-Cmd-0.30-Restore-compatibility-with-App-Cmd-0.328.patch new file mode 100644 index 0000000..5db3548 --- /dev/null +++ b/MouseX-App-Cmd-0.30-Restore-compatibility-with-App-Cmd-0.328.patch @@ -0,0 +1,59 @@ +From 08f7400d0f47dceec16a72d7d42453026613a853 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <[email protected]> +Date: Mon, 30 Nov 2015 14:31:21 +0100 +Subject: [PATCH] Restore compatibility with App-Cmd-0.328 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +App-Cmd-0.328 something changed and that broke MouseX::App::Cmd. + +This patch is similar to change in MooseX-App-Cmd-0.32. It adds +dependency on MouseX::NonMoose. + +CPAN RT#107068 + +Petr Písař: Ported to 0.30. + +Signed-off-by: Petr Písař <[email protected]> +--- + lib/MouseX/App/Cmd.pm | 20 ++------------------ + 1 file changed, 2 insertions(+), 18 deletions(-) + +diff --git a/lib/MouseX/App/Cmd.pm b/lib/MouseX/App/Cmd.pm +index d9bc2bc..30446bd 100644 +--- a/lib/MouseX/App/Cmd.pm ++++ b/lib/MouseX/App/Cmd.pm +@@ -3,27 +3,11 @@ use 5.006; + package MouseX::App::Cmd; # git description: v0.29-32-g69e2d04 + use Mouse; + use English '-no_match_vars'; +-use File::Basename (); ++use MouseX::NonMoose; ++extends 'App::Cmd'; + + our $VERSION = '0.30'; # VERSION + use namespace::autoclean; +-extends 'Mouse::Object', 'App::Cmd'; +- +-sub BUILDARGS { +- my ( undef, @arg ) = @_; +- return {} if !@arg; +- return { arg => $arg[0] } if 1 == @arg; +- return {@arg}; +-} +- +-sub BUILD { +- my $self = shift; +- my $class = blessed $self; +- $self->{arg0} = File::Basename::basename($PROGRAM_NAME); +- $self->{command} = $class->_command( {} ); +- $self->{full_arg0} = $PROGRAM_NAME; +- return; +-} + + ## no critic (Modules::RequireExplicitInclusion) + __PACKAGE__->meta->make_immutable(); +-- +2.4.3 + diff --git a/perl-MouseX-App-Cmd.spec b/perl-MouseX-App-Cmd.spec index c492422..5a9e764 100644 --- a/perl-MouseX-App-Cmd.spec +++ b/perl-MouseX-App-Cmd.spec @@ -1,11 +1,13 @@ Name: perl-MouseX-App-Cmd Version: 0.30 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Mashes up MouseX::Getopt and App::Cmd License: GPL+ or Artistic URL: http://search.cpan.org/dist/MouseX-App-Cmd/ Source0: http://www.cpan.org/authors/id/E/ET/ETHER/MouseX-App-Cmd-%{version}.tar.gz +# Restore compatibility with App-Cmd-0.328, bug #1268805, CPAN RT #107068 +Patch0: MouseX-App-Cmd-0.30-Restore-compatibility-with-App-Cmd-0.328.patch BuildArch: noarch BuildRequires: perl @@ -15,7 +17,6 @@ BuildRequires: perl(base) BuildRequires: perl(Data::Dumper) BuildRequires: perl(English) BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 -BuildRequires: perl(File::Basename) BuildRequires: perl(File::Spec) BuildRequires: perl(Getopt::Long::Descriptive) >= 0.091 BuildRequires: perl(lib) @@ -23,6 +24,7 @@ BuildRequires: perl(Mouse) BuildRequires: perl(Mouse::Object) BuildRequires: perl(MouseX::ConfigFromFile) BuildRequires: perl(MouseX::Getopt) +BuildRequires: perl(MouseX::NonMoose) BuildRequires: perl(namespace::autoclean) BuildRequires: perl(strict) BuildRequires: perl(Test::More) @@ -46,6 +48,7 @@ This module marries App::Cmd with MouseX::Getopt. %prep %setup -q -n MouseX-App-Cmd-%{version} +%patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 @@ -66,6 +69,9 @@ make test %{_mandir}/man3/MouseX* %changelog +* Mon Nov 30 2015 Petr Pisar <[email protected]> - 0.30-5 +- Restore compatibility with App-Cmd-0.328 (bug #1268805) + * Thu Jun 18 2015 Fedora Release Engineering <[email protected]> - 0.30-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild -- cgit v0.11.2 http://pkgs.fedoraproject.org/cgit/perl-MouseX-App-Cmd.git/commit/?h=master&id=a9258456243ccf4abbc8b1ed2f2ba81c7377d42e -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list [email protected] http://lists.fedoraproject.org/admin/lists/[email protected]
