Fix compatibility with GLD 0.107

This commit is contained in:
Paul Howarth 2021-03-15 09:45:51 +00:00
parent a34ed4f99e
commit 8960e51b59
2 changed files with 13 additions and 16 deletions

View File

@ -4,15 +4,15 @@
\t--foo INT A foo
}
:
+ $Getopt::Long::Descriptive::VERSION < 0.106 ?
+ # Note: Getopt::Long::Descriptive 0.106 not supported
+ $Getopt::Long::Descriptive::VERSION < 0.107 ?
qq{usage: 104_override_usage.t [-?] [long options...]
\t-? --[no-]usage --[no-]help Prints this usage information.
\t--foo INT A foo
}
+ :
+ qq{usage: 104_override_usage.t [-?] [long options...]
+\t--[no-]help (or -?) Prints
+\t this usage information.
+\t--[no-]help (or -?) Prints this usage information.
+\t aka --usage
+\t--foo INT A foo
+}
@ -47,12 +47,12 @@
--baz STR Documentation for "baz"
USAGE
}
+if ( $Getopt::Long::Descriptive::VERSION >= 0.106 )
+# Note: Getopt::Long::Descriptive 0.106 not supported
+if ( $Getopt::Long::Descriptive::VERSION >= 0.107 )
+{
+$expected = <<'USAGE';
+usage: 110_sort_usage_by_attr_order.t [-?] [long options...]
+ --[no-]help (or -?) Prints
+ this usage information.
+ --[no-]help (or -?) Prints this usage information.
+ aka --usage
+ --foo STR Documentation for "foo"
+ --bar STR Documentation for "bar"

View File

@ -1,11 +1,11 @@
Name: perl-MouseX-Getopt
Summary: Mouse role for processing command line options
Version: 0.38
Release: 11%{?dist}
Release: 12%{?dist}
License: GPL+ or Artistic
URL: https://metacpan.org/release/MouseX-Getopt
Source0: https://cpan.metacpan.org/modules/by-module/MouseX/MouseX-Getopt-%{version}.tar.gz
Patch0: MouseX-Getopt-0.38-GLD-0.106.patch
Patch0: MouseX-Getopt-0.38-GLD-0.107.patch
BuildArch: noarch
# Module Build
BuildRequires: perl-generators
@ -22,7 +22,6 @@ BuildRequires: perl(Mouse::Meta::Attribute)
BuildRequires: perl(Mouse::Role)
BuildRequires: perl(Mouse::Util::TypeConstraints)
# Test Suite
BuildRequires: expect
BuildRequires: perl(File::Spec)
BuildRequires: perl(Mouse::Meta::Class)
BuildRequires: perl(Scalar::Util)
@ -50,7 +49,7 @@ objects using parameters passed in from the command line.
%prep
%setup -q -n MouseX-Getopt-%{version}
# Fix compatibility with GLD 0.106
# Fix compatibility with GLD 0.107
%patch0
%build
@ -61,12 +60,7 @@ perl Build.PL --installdirs=vendor
./Build install --destdir=%{buildroot} --create_packlist=0
%check
# Expect is used so that we get a PTY, as if we were in a real terminal
expect -c '
spawn ./Build test
expect eof
exit [lindex [wait] 3]
'
./Build test
%files
# Note: malformed LICENSE file in 0.35 .. 0.38 not shipped
@ -85,6 +79,9 @@ expect -c '
%{_mandir}/man3/MouseX::Getopt::Strict.3*
%changelog
* Mon Mar 15 2021 Paul Howarth <paul@city-fan.org> - 0.38-12
- Fix compatibility with GLD 0.107
* Sat Mar 13 2021 Paul Howarth <paul@city-fan.org> - 0.38-11
- Fix compatibility with GLD 0.106