Merge branch 'master' into el6

Conflicts:
	.gitignore
	perl-Try-Tiny.spec
	sources

.gitignore

@@ -1 +1 @@
-/Try-Tiny-0.07.tar.gz
+/Try-Tiny-[0-9.]*.tar.gz

perl-Try-Tiny.spec

@@ -1,42 +1,46 @@
-Name:           perl-Try-Tiny
+Name:		perl-Try-Tiny
-Summary:        Minimal try/catch with proper localization of $@
+Summary:	Minimal try/catch with proper localization of $@
-Version:        0.07
+Version:	0.11
-Release:        1%{?dist}
+Release:	4%{?dist}
-License:        MIT
+License:	MIT
-Group:          Development/Libraries
+Group:		Development/Libraries
-Source0:        http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Try-Tiny-%{version}.tar.gz
+URL:		http://search.cpan.org/dist/Try-Tiny
-URL:            http://search.cpan.org/dist/Try-Tiny
+Source0:	http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Try-Tiny-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildArch:	noarch
-BuildArch:      noarch
+BuildRequires:	perl(Carp)
+BuildRequires:	perl(ExtUtils::MakeMaker)
+BuildRequires:	perl(Test::More)
+Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
-BuildRequires:  perl(ExtUtils::MakeMaker)
+# obsolete/provide old tests subpackage
-BuildRequires:  perl(Test::More)
+# can be removed during F19 development cycle
-
+Obsoletes:	%{name}-tests < 0.11-3
-%{?perl_default_filter}
+Provides:	%{name}-tests = %{version}-%{release}
-%{?perl_default_subpackage_tests}
 
 %description
-The main focus of this module is to provide simple and reliable error
+This module provides bare bones try/catch statements that are designed to
-handling for those having a hard time installing TryCatch, but who still
+minimize common mistakes with eval blocks, and NOTHING else.
-want to write correct 'eval' blocks without 5 lines of boilerplate each
+
-time.
+This is unlike TryCatch, which provides a nice syntax and avoids adding
+another call stack layer, and supports calling return from the try block to
+return from the parent subroutine. These extra features come at a cost of a
+few dependencies, namely Devel::Declare and Scope::Upper that are occasionally
+problematic, and the additional catch filtering uses Moose type constraints,
+which may not be desirable either.
 
 %prep
 %setup -q -n Try-Tiny-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+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 {} ';'
-find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
+%{_fixperms} %{buildroot}
-
-%{_fixperms} %{buildroot}/*
 
 %check
 make test
@@ -45,33 +49,62 @@ make test
 rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
+%doc Changes t/
-%doc Changes
 %{perl_vendorlib}/Try/
 %{_mandir}/man3/Try::Tiny.3pm*
 
 %changelog
-* Mon Nov  1 2010 Paul Howarth <paul@city-fan.org> 0.07-1
+* Mon Mar 26 2012 Paul Howarth <paul@city-fan.org> - 0.11-4
-- update to 0.07:
+- BR: perl(Carp)
-  - allow multiple finally blocks
+- Don't need to remove empty directories from buildroot
-  - pass the error, if any, to finally blocks when called
+- Don't use macros for commands
-  - documentation fixes and clarifications
+- Drop redundant %%{?perl_default_filter}
-- this release by RJBS -> update source URL
+- Enhance %%description
+- Reinstate EPEL-5 compatibility:
+  - Define buildroot
+  - Clean buildroot in %%install and %%clean
+- Use tabs
+
+* Sun Jan 22 2012 Iain Arnell <iarnell@gmail.com> - 0.11-3
+- Drop tests subpackage; move tests to main package documentation
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Sun Oct 02 2011 Iain Arnell <iarnell@gmail.com> - 0.11-1
+- Update to latest upstream version
+
+* Wed Jun 15 2011 Marcela Mašláňová <mmaslano@redhat.com> - 0.09-2
+- Perl mass rebuild
+
+* Fri Mar 18 2011 Iain Arnell <iarnell@gmail.com> - 0.09-1
+- Update to latest upstream version
+- Clean up spec for modern rpmbuild
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.07-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Nov  1 2010 Paul Howarth <paul@city-fan.org> - 0.07-1
+- Update to 0.07
+  - Allow multiple finally blocks
+  - Pass the error, if any, to finally blocks when called
+  - Documentation fixes and clarifications
+- This release by RJBS -> update source URL
 
 * Fri May 07 2010 Marcela Maslanova <mmaslano@redhat.com> - 0.04-2
 - Mass rebuild with perl-5.12.0
 
-* Tue Mar 02 2010 Chris Weyl <cweyl@alumni.drew.edu> 0.04-1
+* Tue Mar 02 2010 Chris Weyl <cweyl@alumni.drew.edu> - 0.04-1
-- update by Fedora::App::MaintainerTools 0.004
+- Update by Fedora::App::MaintainerTools 0.004
 - PERL_INSTALL_ROOT => DESTDIR
-- updating to latest GA CPAN version (0.04)
+- Updating to latest GA CPAN version (0.04)
 
 * Fri Dec  4 2009 Stepan Kasal <skasal@redhat.com> - 0.02-2
-- rebuild against perl 5.10.1
+- Rebuild against perl 5.10.1
 
-* Tue Sep 15 2009 Chris Weyl <cweyl@alumni.drew.edu> 0.02-1
+* Tue Sep 15 2009 Chris Weyl <cweyl@alumni.drew.edu> - 0.02-1
-- submission
+- Submission
 
-* Tue Sep 15 2009 Chris Weyl <cweyl@alumni.drew.edu> 0.02-0
+* Tue Sep 15 2009 Chris Weyl <cweyl@alumni.drew.edu> - 0.02-0
-- initial RPM packaging
+- Initial RPM packaging
-- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)
+- Generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)

sources

@@ -1 +1 @@
-a7a7645da6248f862855cd80bf67e29d  Try-Tiny-0.07.tar.gz
+4d2c8ff385ac3513edf4c042dd0eacbe  Try-Tiny-0.11.tar.gz