[perl-Try-Tiny: 6/7] Spec clean-up

Paul Howarth pghmcfc at fedoraproject.org
Mon Mar 26 18:23:20 UTC 2012


commit ae7dbd2f62b762f35295f26f378ce0c6f71e4098
Author: Paul Howarth <paul at city-fan.org>
Date:   Mon Mar 26 19:19:01 2012 +0100

    Spec clean-up
    
    - BR: perl(Carp)
    - Don't need to remove empty directories from buildroot
    - Don't use macros for commands
    - Drop redundant %{?perl_default_filter}
    - Enhance %description
    - Reinstate EPEL-5 compatibility:
      - Define buildroot
      - Clean buildroot in %install and %clean
    - Use tabs

 .gitignore         |    4 +-
 perl-Try-Tiny.spec |  111 ++++++++++++++++++++++++++++++----------------------
 2 files changed, 65 insertions(+), 50 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9771a50..8a5c581 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-/Try-Tiny-0.07.tar.gz
-/Try-Tiny-0.09.tar.gz
-/Try-Tiny-0.11.tar.gz
+/Try-Tiny-[0-9.]*.tar.gz
diff --git a/perl-Try-Tiny.spec b/perl-Try-Tiny.spec
index bab25a9..e06adf8 100644
--- a/perl-Try-Tiny.spec
+++ b/perl-Try-Tiny.spec
@@ -1,93 +1,110 @@
-Name:           perl-Try-Tiny
-Summary:        Minimal try/catch with proper localization of $@
-Version:        0.11
-Release:        3%{?dist}
-License:        MIT
-Group:          Development/Libraries
-Source0:        http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Try-Tiny-%{version}.tar.gz
-URL:            http://search.cpan.org/dist/Try-Tiny
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildArch:      noarch
-
-BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Test::More)
+Name:		perl-Try-Tiny
+Summary:	Minimal try/catch with proper localization of $@
+Version:	0.11
+Release:	4%{?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
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
+BuildArch:	noarch
+BuildRequires:	perl(Carp)
+BuildRequires:	perl(ExtUtils::MakeMaker)
+BuildRequires:	perl(Test::More)
+Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 # obsolete/provide old tests subpackage
 # can be removed during F19 development cycle
-Obsoletes:      %{name}-tests < 0.11-3
-Provides:       %{name}-tests = %{version}-%{release}
-
-%{?perl_default_filter}
+Obsoletes:	%{name}-tests < 0.11-3
+Provides:	%{name}-tests = %{version}-%{release}
 
 %description
-The main focus of this module is to provide simple and reliable error
-handling for those having a hard time installing TryCatch, but who still
-want to write correct 'eval' blocks without 5 lines of boilerplate each
-time.
+This module provides bare bones try/catch statements that are designed to
+minimize common mistakes with eval blocks, and NOTHING else.
+
+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
 
+%clean
+rm -rf %{buildroot}
+
 %files
 %doc Changes t/
 %{perl_vendorlib}/Try/
 %{_mandir}/man3/Try::Tiny.3pm*
 
 %changelog
-* Sun Jan 22 2012 Iain Arnell <iarnell at gmail.com> 0.11-3
-- drop tests subpackage; move tests to main package documentation
+* Mon Mar 26 2012 Paul Howarth <paul at city-fan.org> - 0.11-4
+- BR: perl(Carp)
+- Don't need to remove empty directories from buildroot
+- Don't use macros for commands
+- Drop redundant %%{?perl_default_filter}
+- Enhance %%description
+- Reinstate EPEL-5 compatibility:
+  - Define buildroot
+  - Clean buildroot in %%install and %%clean
+- Use tabs
+
+* Sun Jan 22 2012 Iain Arnell <iarnell at gmail.com> - 0.11-3
+- Drop tests subpackage; move tests to main package documentation
 
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
-* Sun Oct 02 2011 Iain Arnell <iarnell at gmail.com> 0.11-1
-- update to latest upstream version
+* Sun Oct 02 2011 Iain Arnell <iarnell at gmail.com> - 0.11-1
+- Update to latest upstream version
 
 * Wed Jun 15 2011 Marcela Mašláňová <mmaslano at redhat.com> - 0.09-2
 - Perl mass rebuild
 
-* Fri Mar 18 2011 Iain Arnell <iarnell at gmail.com> 0.09-1
-- update to latest upstream version
-- clean up spec for modern rpmbuild
+* Fri Mar 18 2011 Iain Arnell <iarnell at 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 at lists.fedoraproject.org> - 0.07-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
-* Mon Nov  1 2010 Paul Howarth <paul at 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
+* Mon Nov  1 2010 Paul Howarth <paul at 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 at redhat.com> - 0.04-2
 - Mass rebuild with perl-5.12.0
 
-* Tue Mar 02 2010 Chris Weyl <cweyl at alumni.drew.edu> 0.04-1
-- update by Fedora::App::MaintainerTools 0.004
+* Tue Mar 02 2010 Chris Weyl <cweyl at alumni.drew.edu> - 0.04-1
+- 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 at redhat.com> - 0.02-2
-- rebuild against perl 5.10.1
+- Rebuild against perl 5.10.1
 
-* Tue Sep 15 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.02-1
-- submission
+* Tue Sep 15 2009 Chris Weyl <cweyl at alumni.drew.edu> - 0.02-1
+- Submission
 
-* Tue Sep 15 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.02-0
-- initial RPM packaging
-- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)
+* Tue Sep 15 2009 Chris Weyl <cweyl at alumni.drew.edu> - 0.02-0
+- Initial RPM packaging
+- Generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)



More information about the perl-devel mailing list