From 2fbe8c8581a4866ff4fd3f90fbc953c596b34665 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:31:26 +0000 Subject: [PATCH 01/13] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e6ace04..8885f59 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := perl-Try-Tiny SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 9479ae7ed109c2e270d99f203af6af414f4934b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= Date: Fri, 4 Dec 2009 02:37:08 +0000 Subject: [PATCH 02/13] - rebuild against perl 5.10.1 --- perl-Try-Tiny.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-Try-Tiny.spec b/perl-Try-Tiny.spec index 54afacc..f1f56b6 100644 --- a/perl-Try-Tiny.spec +++ b/perl-Try-Tiny.spec @@ -1,6 +1,6 @@ Name: perl-Try-Tiny Version: 0.02 -Release: 1%{?dist} +Release: 2%{?dist} # lib/Try/Tiny.pm -> MIT License: MIT Group: Development/Libraries @@ -51,6 +51,9 @@ rm -rf %{buildroot} %{_mandir}/man3/*.3* %changelog +* Fri Dec 4 2009 Stepan Kasal - 0.02-2 +- rebuild against perl 5.10.1 + * Tue Sep 15 2009 Chris Weyl 0.02-1 - submission From c1bbc6c5754a7e4682df42d94e3d1afab4851c0a Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Tue, 2 Mar 2010 17:33:37 +0000 Subject: [PATCH 03/13] - update by Fedora::App::MaintainerTools 0.004 - PERL_INSTALL_ROOT => DESTDIR - updating to latest GA CPAN version (0.04) --- .cvsignore | 2 +- perl-Try-Tiny.spec | 37 +++++++++++++++++++++---------------- sources | 2 +- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/.cvsignore b/.cvsignore index 13e3751..4ef0f65 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Try-Tiny-0.02.tar.gz +Try-Tiny-0.04.tar.gz diff --git a/perl-Try-Tiny.spec b/perl-Try-Tiny.spec index f1f56b6..8cc1f3a 100644 --- a/perl-Try-Tiny.spec +++ b/perl-Try-Tiny.spec @@ -1,20 +1,21 @@ -Name: perl-Try-Tiny -Version: 0.02 -Release: 2%{?dist} -# lib/Try/Tiny.pm -> MIT -License: MIT -Group: Development/Libraries -Summary: Minimal try/catch with proper localization of $@ -Source: http://search.cpan.org/CPAN/authors/id/N/NU/NUFFIN/Try-Tiny-%{version}.tar.gz -Url: http://search.cpan.org/dist/Try-Tiny -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -BuildArch: noarch +Name: perl-Try-Tiny +Summary: Minimal try/catch with proper localization of $@ +Version: 0.04 +Release: 1%{?dist} +License: MIT +Group: Development/Libraries +Source0: http://search.cpan.org/CPAN/authors/id/N/NU/NUFFIN/Try-Tiny-%{version}.tar.gz +URL: http://search.cpan.org/dist/Try-Tiny +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildArch: noarch + +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(Test::More) -BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(Test::More) %{?perl_default_filter} +%{?perl_default_subpackage_tests} %description The main focus of this module is to provide simple and reliable error @@ -32,7 +33,7 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} -make pure_install PERL_INSTALL_ROOT=%{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 ';' @@ -51,6 +52,11 @@ rm -rf %{buildroot} %{_mandir}/man3/*.3* %changelog +* Tue Mar 02 2010 Chris Weyl 0.04-1 +- update by Fedora::App::MaintainerTools 0.004 +- PERL_INSTALL_ROOT => DESTDIR +- updating to latest GA CPAN version (0.04) + * Fri Dec 4 2009 Stepan Kasal - 0.02-2 - rebuild against perl 5.10.1 @@ -60,4 +66,3 @@ rm -rf %{buildroot} * Tue Sep 15 2009 Chris Weyl 0.02-0 - initial RPM packaging - generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) - diff --git a/sources b/sources index f6aeca4..7c12612 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a6ceb75d533046d85c797ad9e3be4212 Try-Tiny-0.02.tar.gz +e15730ec7540c40cdd8f8e088c6e6a6c Try-Tiny-0.04.tar.gz From 34a9d286e93699f95c710404c41d2da9dcfc47a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Fri, 7 May 2010 06:59:05 +0000 Subject: [PATCH 04/13] - Mass rebuild with perl-5.12.0 --- perl-Try-Tiny.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-Try-Tiny.spec b/perl-Try-Tiny.spec index 8cc1f3a..e982624 100644 --- a/perl-Try-Tiny.spec +++ b/perl-Try-Tiny.spec @@ -1,7 +1,7 @@ Name: perl-Try-Tiny Summary: Minimal try/catch with proper localization of $@ Version: 0.04 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: Development/Libraries Source0: http://search.cpan.org/CPAN/authors/id/N/NU/NUFFIN/Try-Tiny-%{version}.tar.gz @@ -52,6 +52,9 @@ rm -rf %{buildroot} %{_mandir}/man3/*.3* %changelog +* Fri May 07 2010 Marcela Maslanova - 0.04-2 +- Mass rebuild with perl-5.12.0 + * Tue Mar 02 2010 Chris Weyl 0.04-1 - update by Fedora::App::MaintainerTools 0.004 - PERL_INSTALL_ROOT => DESTDIR From 2dc91610739fc69c5cbd4ccd56a584d9156e88b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 08:26:32 +0000 Subject: [PATCH 05/13] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 8885f59..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: perl-Try-Tiny -# $Id$ -NAME := perl-Try-Tiny -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index 07b468a..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -perl-Try-Tiny-0_02-1_fc11:HEAD:perl-Try-Tiny-0.02-1.fc11.src.rpm:1253234067 From 505f548b33005dd82e492156cbc6ab10697fb066 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Mon, 1 Nov 2010 23:55:45 +0000 Subject: [PATCH 06/13] Update to 0.07 - New upstream release 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 --- .gitignore | 2 +- perl-Try-Tiny.spec | 28 +++++++++++++++++----------- sources | 2 +- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 4ef0f65..443ed3b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -Try-Tiny-0.04.tar.gz +/Try-Tiny-0.07.tar.gz diff --git a/perl-Try-Tiny.spec b/perl-Try-Tiny.spec index e982624..8250d13 100644 --- a/perl-Try-Tiny.spec +++ b/perl-Try-Tiny.spec @@ -1,10 +1,10 @@ -Name: perl-Try-Tiny -Summary: Minimal try/catch with proper localization of $@ -Version: 0.04 -Release: 2%{?dist} -License: MIT +Name: perl-Try-Tiny +Summary: Minimal try/catch with proper localization of $@ +Version: 0.07 +Release: 1%{?dist} +License: MIT Group: Development/Libraries -Source0: http://search.cpan.org/CPAN/authors/id/N/NU/NUFFIN/Try-Tiny-%{version}.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Try-Tiny-%{version}.tar.gz URL: http://search.cpan.org/dist/Try-Tiny BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -13,7 +13,6 @@ BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) - %{?perl_default_filter} %{?perl_default_subpackage_tests} @@ -43,15 +42,22 @@ find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' make test %clean -rm -rf %{buildroot} +rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc Changes -%{perl_vendorlib}/* -%{_mandir}/man3/*.3* +%doc Changes +%{perl_vendorlib}/Try/ +%{_mandir}/man3/Try::Tiny.3pm* %changelog +* Mon Nov 1 2010 Paul Howarth 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 - 0.04-2 - Mass rebuild with perl-5.12.0 diff --git a/sources b/sources index 7c12612..6566eb5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e15730ec7540c40cdd8f8e088c6e6a6c Try-Tiny-0.04.tar.gz +a7a7645da6248f862855cd80bf67e29d Try-Tiny-0.07.tar.gz From c6b398790d5754510f54e610699a3ee0e4a8f3d5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 03:59:13 -0600 Subject: [PATCH 07/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- perl-Try-Tiny.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-Try-Tiny.spec b/perl-Try-Tiny.spec index 8250d13..3f4add5 100644 --- a/perl-Try-Tiny.spec +++ b/perl-Try-Tiny.spec @@ -1,7 +1,7 @@ Name: perl-Try-Tiny Summary: Minimal try/catch with proper localization of $@ Version: 0.07 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: Development/Libraries Source0: http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Try-Tiny-%{version}.tar.gz @@ -51,6 +51,9 @@ rm -rf %{buildroot} %{_mandir}/man3/Try::Tiny.3pm* %changelog +* Wed Feb 09 2011 Fedora Release Engineering - 0.07-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Nov 1 2010 Paul Howarth 0.07-1 - update to 0.07: - allow multiple finally blocks From 0d9574b7e911123925c2d7bd4143ad0845d4aba6 Mon Sep 17 00:00:00 2001 From: Iain Arnell Date: Fri, 18 Mar 2011 11:30:24 +0100 Subject: [PATCH 08/13] update to 0.09 --- .gitignore | 1 + perl-Try-Tiny.spec | 16 +++++++--------- sources | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 443ed3b..1bd9357 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /Try-Tiny-0.07.tar.gz +/Try-Tiny-0.09.tar.gz diff --git a/perl-Try-Tiny.spec b/perl-Try-Tiny.spec index 3f4add5..23620df 100644 --- a/perl-Try-Tiny.spec +++ b/perl-Try-Tiny.spec @@ -1,12 +1,11 @@ Name: perl-Try-Tiny Summary: Minimal try/catch with proper localization of $@ -Version: 0.07 -Release: 2%{?dist} +Version: 0.09 +Release: 1%{?dist} License: MIT Group: Development/Libraries -Source0: http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Try-Tiny-%{version}.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Try-Tiny-%{version}.tar.gz URL: http://search.cpan.org/dist/Try-Tiny -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch @@ -30,8 +29,6 @@ time. 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 ';' @@ -41,9 +38,6 @@ find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %check make test -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root,-) %doc Changes @@ -51,6 +45,10 @@ rm -rf %{buildroot} %{_mandir}/man3/Try::Tiny.3pm* %changelog +* Fri Mar 18 2011 Iain Arnell 0.09-1 +- update to latest upstream version +- clean up spec for modern rpmbuild + * Wed Feb 09 2011 Fedora Release Engineering - 0.07-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 6566eb5..3803b8d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a7a7645da6248f862855cd80bf67e29d Try-Tiny-0.07.tar.gz +e526aa7d80cbc690c4a20925a592c13c Try-Tiny-0.09.tar.gz From 3d2f2838a5e4ec11ad582cb25abf52d940ca2450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Wed, 15 Jun 2011 09:17:50 +0200 Subject: [PATCH 09/13] Perl mass rebuild --- perl-Try-Tiny.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-Try-Tiny.spec b/perl-Try-Tiny.spec index 23620df..8d092bb 100644 --- a/perl-Try-Tiny.spec +++ b/perl-Try-Tiny.spec @@ -1,7 +1,7 @@ Name: perl-Try-Tiny Summary: Minimal try/catch with proper localization of $@ Version: 0.09 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: Development/Libraries Source0: http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Try-Tiny-%{version}.tar.gz @@ -45,6 +45,9 @@ make test %{_mandir}/man3/Try::Tiny.3pm* %changelog +* Wed Jun 15 2011 Marcela Mašláňová - 0.09-2 +- Perl mass rebuild + * Fri Mar 18 2011 Iain Arnell 0.09-1 - update to latest upstream version - clean up spec for modern rpmbuild From 64f7b536a6b9429552668abc7dfd0a9f2650dc46 Mon Sep 17 00:00:00 2001 From: Iain Arnell Date: Sun, 2 Oct 2011 14:02:29 +0200 Subject: [PATCH 10/13] update to 0.11 --- .gitignore | 1 + perl-Try-Tiny.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1bd9357..9771a50 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /Try-Tiny-0.07.tar.gz /Try-Tiny-0.09.tar.gz +/Try-Tiny-0.11.tar.gz diff --git a/perl-Try-Tiny.spec b/perl-Try-Tiny.spec index 8d092bb..c3b5f00 100644 --- a/perl-Try-Tiny.spec +++ b/perl-Try-Tiny.spec @@ -1,7 +1,7 @@ Name: perl-Try-Tiny Summary: Minimal try/catch with proper localization of $@ -Version: 0.09 -Release: 2%{?dist} +Version: 0.11 +Release: 1%{?dist} License: MIT Group: Development/Libraries Source0: http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Try-Tiny-%{version}.tar.gz @@ -39,12 +39,14 @@ find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' make test %files -%defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/Try/ %{_mandir}/man3/Try::Tiny.3pm* %changelog +* Sun Oct 02 2011 Iain Arnell 0.11-1 +- update to latest upstream version + * Wed Jun 15 2011 Marcela Mašláňová - 0.09-2 - Perl mass rebuild diff --git a/sources b/sources index 3803b8d..830569d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e526aa7d80cbc690c4a20925a592c13c Try-Tiny-0.09.tar.gz +4d2c8ff385ac3513edf4c042dd0eacbe Try-Tiny-0.11.tar.gz From 00304e1c5d6dbe15e3bfe6db1314deb609c1464c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 14:20:08 -0600 Subject: [PATCH 11/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- perl-Try-Tiny.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-Try-Tiny.spec b/perl-Try-Tiny.spec index c3b5f00..33b1482 100644 --- a/perl-Try-Tiny.spec +++ b/perl-Try-Tiny.spec @@ -1,7 +1,7 @@ Name: perl-Try-Tiny Summary: Minimal try/catch with proper localization of $@ Version: 0.11 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: Development/Libraries Source0: http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Try-Tiny-%{version}.tar.gz @@ -44,6 +44,9 @@ make test %{_mandir}/man3/Try::Tiny.3pm* %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 0.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sun Oct 02 2011 Iain Arnell 0.11-1 - update to latest upstream version From 9e9c161c3564c03358ec10dc8758aa58ec0c33f4 Mon Sep 17 00:00:00 2001 From: Iain Arnell Date: Sun, 22 Jan 2012 11:26:55 +0100 Subject: [PATCH 12/13] drop tests subpackage --- perl-Try-Tiny.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/perl-Try-Tiny.spec b/perl-Try-Tiny.spec index 33b1482..bab25a9 100644 --- a/perl-Try-Tiny.spec +++ b/perl-Try-Tiny.spec @@ -1,7 +1,7 @@ Name: perl-Try-Tiny Summary: Minimal try/catch with proper localization of $@ Version: 0.11 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT Group: Development/Libraries Source0: http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Try-Tiny-%{version}.tar.gz @@ -12,8 +12,12 @@ BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) +# 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} -%{?perl_default_subpackage_tests} %description The main focus of this module is to provide simple and reliable error @@ -39,11 +43,14 @@ find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' make test %files -%doc Changes +%doc Changes t/ %{perl_vendorlib}/Try/ %{_mandir}/man3/Try::Tiny.3pm* %changelog +* Sun Jan 22 2012 Iain Arnell 0.11-3 +- drop tests subpackage; move tests to main package documentation + * Fri Jan 13 2012 Fedora Release Engineering - 0.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From ae7dbd2f62b762f35295f26f378ce0c6f71e4098 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Mon, 26 Mar 2012 19:19:01 +0100 Subject: [PATCH 13/13] 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 0.11-3 -- drop tests subpackage; move tests to main package documentation +* Mon Mar 26 2012 Paul Howarth - 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 - 0.11-3 +- Drop tests subpackage; move tests to main package documentation * Fri Jan 13 2012 Fedora Release Engineering - 0.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild -* Sun Oct 02 2011 Iain Arnell 0.11-1 -- update to latest upstream version +* Sun Oct 02 2011 Iain Arnell - 0.11-1 +- Update to latest upstream version * Wed Jun 15 2011 Marcela Mašláňová - 0.09-2 - Perl mass rebuild -* Fri Mar 18 2011 Iain Arnell 0.09-1 -- update to latest upstream version -- clean up spec for modern rpmbuild +* Fri Mar 18 2011 Iain Arnell - 0.09-1 +- Update to latest upstream version +- Clean up spec for modern rpmbuild * Wed Feb 09 2011 Fedora Release Engineering - 0.07-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild -* Mon Nov 1 2010 Paul Howarth 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 - 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 - 0.04-2 - Mass rebuild with perl-5.12.0 -* Tue Mar 02 2010 Chris Weyl 0.04-1 -- update by Fedora::App::MaintainerTools 0.004 +* Tue Mar 02 2010 Chris Weyl - 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 - 0.02-2 -- rebuild against perl 5.10.1 +- Rebuild against perl 5.10.1 -* Tue Sep 15 2009 Chris Weyl 0.02-1 -- submission +* Tue Sep 15 2009 Chris Weyl - 0.02-1 +- Submission -* Tue Sep 15 2009 Chris Weyl 0.02-0 -- initial RPM packaging -- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8) +* Tue Sep 15 2009 Chris Weyl - 0.02-0 +- Initial RPM packaging +- Generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.8)