8
0

Compare commits

5 Commits

5 changed files with 87 additions and 14 deletions

12
README.md Normal file
View File

@@ -0,0 +1,12 @@
## Build Results
Current state of perl in openSUSE:Factory is
![Factory build results](https://br.opensuse.org/status/openSUSE:Factory/perl-MouseX-Getopt/standard)
The current state of perl in the devel project build (devel:languages:perl)
![Devel project build results](https://br.opensuse.org/status/devel:languages:perl/perl-MouseX-Getopt)

View File

@@ -1,6 +1,6 @@
---
preamble: |-
Provides: perl-mousex-getopt = %{version}
Obsoletes: perl-mousex-getopt <= 0.37
patches:
pr-15.patch: -p1
pr-15.patch: -p1 PATCH-FIX-UPSTREAM https://github.com/gfx/mousex-getopt/pull/15
post_prep: |-
# https://github.com/gfx/mousex-getopt/pull/16 Test fails with Getopt-Long-Descriptive 0.116
rm t/106_no_ignore_case.t

View File

@@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Jan 20 11:10:27 UTC 2025 - Tina Müller <tina.mueller@suse.com>
- Fix build with newest Getopt-Long-Descriptive; remove test
t/106_no_ignore_case.t, see https://github.com/gfx/mousex-getopt/pull/16
-------------------------------------------------------------------
Mon Jul 8 16:23:38 UTC 2024 - Tina Müller <tina.mueller@suse.com>
- Update pr-15.patch
-------------------------------------------------------------------
Sat Mar 27 08:32:12 UTC 2021 - Stephan Kulow <coolo@suse.com>

View File

@@ -1,7 +1,7 @@
#
# spec file for package perl-MouseX-Getopt
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,17 +20,20 @@
Name: perl-MouseX-Getopt
Version: 0.38
Release: 0
Summary: Mouse role for processing command line options
License: Artistic-1.0 OR GPL-1.0-or-later
Summary: Mouse role for processing command line options
URL: https://metacpan.org/release/%{cpan_name}
Source0: https://cpan.metacpan.org/authors/id/G/GF/GFUJI/%{cpan_name}-%{version}.tar.gz
Source1: cpanspec.yml
Source100: README.md
# PATCH-FIX-UPSTREAM https://github.com/gfx/mousex-getopt/pull/15
Patch0: pr-15.patch
BuildArch: noarch
BuildRequires: perl
BuildRequires: perl-macros
BuildRequires: perl(Getopt::Long) >= 2.37
BuildRequires: perl(Getopt::Long::Descriptive) >= 0.091
BuildRequires: perl(Module::Build)
BuildRequires: perl(Module::Build::Tiny) >= 0.035
BuildRequires: perl(Mouse) >= 0.64
BuildRequires: perl(Mouse::Meta::Attribute)
@@ -39,7 +42,7 @@ BuildRequires: perl(Mouse::Role)
BuildRequires: perl(Mouse::Util::TypeConstraints)
BuildRequires: perl(MouseX::ConfigFromFile)
BuildRequires: perl(MouseX::SimpleConfig)
BuildRequires: perl(Test::Exception) >= 0.210000
BuildRequires: perl(Test::Exception) >= 0.21
BuildRequires: perl(Test::More) >= 0.88
BuildRequires: perl(Test::Mouse)
BuildRequires: perl(Test::Warn) >= 0.21
@@ -50,10 +53,6 @@ Requires: perl(Mouse::Meta::Attribute)
Requires: perl(Mouse::Role)
Requires: perl(Mouse::Util::TypeConstraints)
%{perl_requires}
# MANUAL BEGIN
Provides: perl-mousex-getopt = %{version}
Obsoletes: perl-mousex-getopt <= 0.37
# MANUAL END
%description
This is a role which provides an alternate constructor for creating objects
@@ -99,6 +98,11 @@ parameters.
%prep
%autosetup -n %{cpan_name}-%{version} -p1
# MANUAL BEGIN
# https://github.com/gfx/mousex-getopt/pull/16 Test fails with Getopt-Long-Descriptive 0.116
rm t/106_no_ignore_case.t
# MANUAL END
%build
perl Build.PL --installdirs=vendor
./Build build --flags=%{?_smp_mflags}
@@ -111,7 +115,7 @@ perl Build.PL --installdirs=vendor
%perl_gen_filelist
%files -f %{name}.files
%doc Changes minil.toml README.md
%doc Changes README.md
%license LICENSE
%changelog

View File

@@ -1,7 +1,7 @@
From c1d1eed00099af8d858536b659864b7ccea41974 Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Sat, 13 Mar 2021 17:46:57 +0000
Subject: [PATCH 1/2] Update for Getopt-Long-Descriptive 0.106
Subject: [PATCH 1/3] Update for Getopt-Long-Descriptive 0.106
GLD is now outputting text with wrapping depending on the terminal
width. This update is enough to get the tests to pass when running
@@ -89,7 +89,7 @@ index e7dd177..7ec0c99 100644
From 45ae6aaabc5413e985860fbfcc8da3bdc929a054 Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Mon, 15 Mar 2021 10:43:14 +0000
Subject: [PATCH 2/2] Update for Getopt-Long-Descriptive 0.107
Subject: [PATCH 2/3] Update for Getopt-Long-Descriptive 0.107
GLD's use of Term::ReadKey has been reverted, so this update should now
work reliably. Use with GLD 0.106 is not supported.
@@ -141,3 +141,49 @@ index 7ec0c99..16cdaa1 100644
aka --usage
--foo STR Documentation for "foo"
--bar STR Documentation for "bar"
From d03ad9f917437520e7d572ba6ecaa368c7d5b9f8 Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Sun, 17 Dec 2023 13:35:47 +0000
Subject: [PATCH 3/3] Update for Getopt-Long-Descriptive 0.113
GLD now uses spaces rather than tabs.
---
t/104_override_usage.t | 7 +++++++
t/110_sort_usage_by_attr_order.t | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/t/104_override_usage.t b/t/104_override_usage.t
index f7c6a31..ec0ad22 100644
--- a/t/104_override_usage.t
+++ b/t/104_override_usage.t
@@ -68,10 +68,17 @@ use Test::Exception;
\t--foo INT A foo
}
:
+ $Getopt::Long::Descriptive::VERSION < 0.113 ?
qq{usage: 104_override_usage.t [-?] [long options...]
\t--[no-]help (or -?) Prints this usage information.
\t aka --usage
\t--foo INT A foo
+}
+ :
+ qq{usage: 104_override_usage.t [-?] [long options...]
+ --[no-]help (or -?) Prints this usage information.
+ aka --usage
+ --foo INT A foo
}
];
diff --git a/t/110_sort_usage_by_attr_order.t b/t/110_sort_usage_by_attr_order.t
index 16cdaa1..477c523 100644
--- a/t/110_sort_usage_by_attr_order.t
+++ b/t/110_sort_usage_by_attr_order.t
@@ -76,6 +76,6 @@ usage: 110_sort_usage_by_attr_order.t [-?] [long options...]
--baz STR Documentation for "baz"
USAGE
}
-$expected =~ s/^[ ]{4}/\t/xmsg;
+$expected =~ s/^[ ]{4}/\t/xmsg unless $Getopt::Long::Descriptive::VERSION >= 0.113;
is($obj->usage->text, $expected, 'Usage text has nicely sorted options');