From 783577246ead0cc8d117fe4c3ecec0dc8efe2ee5 Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Fri, 11 Dec 2015 10:30:48 +0000
Subject: [PATCH] Update to 0.24
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- New upstream release 0.24
  - Fix syntax of example code (PR#22)
  - 'perl' removed from prerequisite recommendations, to avoid tripping up CPAN
    clients
  - Sub::Util is used preferentially to Sub::Name in most cases (PR#27)
- This release by ETHER → update source URL
- Modernize spec
- Don't run the extra tests
---
 Try-Tiny-0.22-old-Test::More.patch | 19 ----------
 perl-Try-Tiny.spec                 | 59 +++++++++++++-----------------
 sources                            |  2 +-
 3 files changed, 26 insertions(+), 54 deletions(-)
 delete mode 100644 Try-Tiny-0.22-old-Test::More.patch

diff --git a/Try-Tiny-0.22-old-Test::More.patch b/Try-Tiny-0.22-old-Test::More.patch
deleted file mode 100644
index 54127a1..0000000
--- a/Try-Tiny-0.22-old-Test::More.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- xt/release/no-tabs.t
-+++ xt/release/no-tabs.t
-@@ -3,7 +3,7 @@ use warnings;
- 
- # this test was generated with Dist::Zilla::Plugin::NoTabsTests 0.07
- 
--use Test::More 0.88;
-+use Test::More;
- use Test::NoTabs;
- 
- my @files = (
-@@ -21,5 +21,6 @@ my @files = (
-     't/when.t'
- );
- 
-+plan tests => scalar @files;
-+
- notabs_ok($_) foreach @files;
--done_testing;
diff --git a/perl-Try-Tiny.spec b/perl-Try-Tiny.spec
index f0c53fe..0a67a2f 100644
--- a/perl-Try-Tiny.spec
+++ b/perl-Try-Tiny.spec
@@ -1,43 +1,33 @@
-# We need to patch the test suite if we have Test::More < 0.88
-%global old_test_more %(perl -MTest::More -e 'print (($Test::More::VERSION < 0.88) ? 1 : 0);' 2>/dev/null || echo 0)
-
 Name:		perl-Try-Tiny
 Summary:	Minimal try/catch with proper localization of $@
-Version:	0.22
-Release:	6%{?dist}
+Version:	0.24
+Release:	1%{?dist}
 License:	MIT
-Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/Try-Tiny
-Source0:	http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Try-Tiny-%{version}.tar.gz
-Patch1:		Try-Tiny-0.22-old-Test::More.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
+Source0:	http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/Try-Tiny-%{version}.tar.gz
 BuildArch:	noarch
 # Module Build
+BuildRequires:	coreutils
+BuildRequires:	findutils
+BuildRequires:	make
 BuildRequires:	perl
-BuildRequires:	perl(ExtUtils::MakeMaker) >= 6.30
-BuildRequires:  perl(strict)
-BuildRequires:  perl(warnings)
+BuildRequires:	perl(ExtUtils::MakeMaker)
 # Module
 BuildRequires:	perl(Carp)
 BuildRequires:	perl(constant)
 BuildRequires:	perl(Exporter) >= 5.57
-BuildRequires:	perl(Sub::Name)
+BuildRequires:	perl(strict)
+BuildRequires:	perl(Sub::Util)
+BuildRequires:	perl(warnings)
 # Test Suite
 BuildRequires:	perl(File::Spec)
-BuildRequires:	perl(IO::Handle)
-BuildRequires:	perl(IPC::Open3)
 BuildRequires:	perl(Test::More)
 # Optional Tests
 BuildRequires:	perl(Capture::Tiny) >= 0.12
-# Extra Tests
-BuildRequires:	perl(Pod::Coverage::TrustPod)
-BuildRequires:	perl(Test::EOL)
-BuildRequires:	perl(Test::NoTabs)
-BuildRequires:	perl(Test::Pod) >= 1.41
-BuildRequires:	perl(Test::Pod::Coverage) >= 1.08
+BuildRequires:	perl(CPAN::Meta) >= 2.120900
 # Runtime
 Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
-Requires:	perl(Sub::Name)
+Requires:	perl(Sub::Util)
 
 # Do not provide private modules from tests packaged as a documentation
 %global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_docdir}/
@@ -56,34 +46,35 @@ which may not be desirable either.
 %prep
 %setup -q -n Try-Tiny-%{version}
 
-# We need to patch the test suite if we have Test::More < 0.88
-%if %{old_test_more}
-%patch1
-%endif
-
 %build
 perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
 make pure_install DESTDIR=%{buildroot}
 find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
 %{_fixperms} %{buildroot}
 
 %check
 make test
-make test TEST_FILES="$(echo $(find xt/ -name '*.t'))"
-
-%clean
-rm -rf %{buildroot}
 
 %files
-%doc Changes LICENSE README t/
+%license LICENCE
+%doc Changes CONTRIBUTING README t/
 %{perl_vendorlib}/Try/
-%{_mandir}/man3/Try::Tiny.3pm*
+%{_mandir}/man3/Try::Tiny.3*
 
 %changelog
+* Fri Dec 11 2015 Paul Howarth <paul@city-fan.org> - 0.24-1
+- Update to 0.24
+  - Fix syntax of example code (PR#22)
+  - 'perl' removed from prerequisite recommendations, to avoid tripping up CPAN
+    clients
+  - Sub::Util is used preferentially to Sub::Name in most cases (PR#27)
+- This release by ETHER → update source URL
+- Modernize spec
+- Don't run the extra tests
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.22-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 1c3b317..d4f8352 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6769658bfbca241a470206c9a8819ff2  Try-Tiny-0.22.tar.gz
+1a12a51cfeb7e2c301e4ae093c7ecdfb  Try-Tiny-0.24.tar.gz