commit fc90843dd02a6202b61c567d2a9b1cb9d71f7bef Author: Paul Howarth <paul@xxxxxxxxxxxx> Date: Thu Mar 1 16:39:37 2012 +0000 Spec clean-up - Drop -tests subpackage (general lack of interest in this), but include them as documentation for the main package - No need to remove empty directories from buildroot - Add buildreqs for Perl core modules that might be dual-lived - Fix script interpreter for test suite since we're packaging it - Drop redundant %{?perl_default_filter} - Don't use macros for commands - Make %files list more explicit - Use tabs Readonly-1.03-interpreter.patch | 88 +++++++++++++++++++++++++ perl-Readonly.spec | 135 ++++++++++++++++++++------------------ 2 files changed, 159 insertions(+), 64 deletions(-) --- diff --git a/Readonly-1.03-interpreter.patch b/Readonly-1.03-interpreter.patch new file mode 100644 index 0000000..ba3a812 --- /dev/null +++ b/Readonly-1.03-interpreter.patch @@ -0,0 +1,88 @@ +--- t/array.t ++++ t/array.t +@@ -1,4 +1,4 @@ +-#!perl -I.. ++#!/usr/bin/perl -I.. + + # Readonly array tests + +--- t/deepa.t ++++ t/deepa.t +@@ -1,4 +1,4 @@ +-#!perl -I.. ++#!/usr/bin/perl -I.. + + # Test Array vs Array1 functionality + +--- t/deeph.t ++++ t/deeph.t +@@ -1,4 +1,4 @@ +-#!perl -I.. ++#!/usr/bin/perl -I.. + + # Test Hash vs Hash1 functionality + +--- t/deeps.t ++++ t/deeps.t +@@ -1,4 +1,4 @@ +-#!perl -I.. ++#!/usr/bin/perl -I.. + + # Test Scalar vs Scalar1 functionality + +--- t/docs.t ++++ t/docs.t +@@ -1,4 +1,4 @@ +-#!perl -I.. ++#!/usr/bin/perl -I.. + + # Examples from the docs -- make sure they work! + +--- t/export.t ++++ t/export.t +@@ -1,4 +1,4 @@ +-#!perl -I.. ++#!/usr/bin/perl -I.. + + # Readonly hash tests + +--- t/hash.t ++++ t/hash.t +@@ -1,4 +1,4 @@ +-#!perl -I.. ++#!/usr/bin/perl -I.. + + # Readonly hash tests + +--- t/readonly.t ++++ t/readonly.t +@@ -1,4 +1,4 @@ +-#!perl -I.. ++#!/usr/bin/perl -I.. + + # Test the Readonly function + +--- t/reassign.t ++++ t/reassign.t +@@ -1,4 +1,4 @@ +-#!perl -I.. ++#!/usr/bin/perl -I.. + + # Readonly reassignment-prevention tests + +--- t/scalar.t ++++ t/scalar.t +@@ -1,4 +1,4 @@ +-#!perl -I.. ++#!/usr/bin/perl -I.. + + # Readonly scalar tests + +--- t/tie.t ++++ t/tie.t +@@ -1,4 +1,4 @@ +-#!perl -I.. ++#!/usr/bin/perl -I.. + + # Test the Readonly function + diff --git a/perl-Readonly.spec b/perl-Readonly.spec index f1982c7..c7384b0 100644 --- a/perl-Readonly.spec +++ b/perl-Readonly.spec @@ -1,76 +1,83 @@ -Name: perl-Readonly -Version: 1.03 -Release: 17%{?dist} -Summary: Facility for creating read-only scalars, arrays, hashes -Group: Development/Libraries -License: GPL+ or Artistic -URL: http://search.cpan.org/dist/Readonly/ -Source0: http://search.cpan.org/CPAN/authors/id/R/RO/ROODE/Readonly-%{version}.tar.gz -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) - -# perl-Readonly-XS builds for all current fedora architectures, so let's -# require it. -Requires: perl(Readonly::XS) - -%{?perl_default_filter} -%{?perl_default_subpackage_tests} +Name: perl-Readonly +Version: 1.03 +Release: 18%{?dist} +Summary: Facility for creating read-only scalars, arrays, hashes +Group: Development/Libraries +License: GPL+ or Artistic +URL: http://search.cpan.org/dist/Readonly/ +Source0: http://search.cpan.org/CPAN/authors/id/R/RO/ROODE/Readonly-%{version}.tar.gz +Patch0: Readonly-1.03-interpreter.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) +BuildArch: noarch +BuildRequires: perl(Exporter) +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(strict) +BuildRequires: perl(Test::More) +BuildRequires: perl(vars) +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) +# Speed it up since we can +Requires: perl(Readonly::XS) + +# Obsolete/provide old -tests subpackage (can be removed in F19 development cycle) +Obsoletes: perl-Readonly-tests < %{version}-%{release} +Provides: perl-Readonly-tests = %{version}-%{release} %description Readonly provides a facility for creating non-modifiable scalars, -arrays, and hashes. Any attempt to modify a Readonly variable throws +arrays, and hashes. Any attempt to modify a Readonly variable throws an exception. Readonly: -* Creates scalars, arrays (not lists), and hashes. -* Creates variables that look and work like native perl variables. -* Creates global or lexical variables. -* Works at runtime or compile time. -* Works with deep or shallow data structures. -* Prevents reassignment of Readonly variables. +* Creates scalars, arrays (not lists), and hashes +* Creates variables that look and work like native perl variables +* Creates global or lexical variables +* Works at run-time or compile-time +* Works with deep or shallow data structures +* Prevents reassignment of Readonly variables %prep %setup -q -n Readonly-%{version} +# Fix script interpreter for test suite since we're packaging it +%patch0 %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} -type d -depth -exec rmdir {} 2>/dev/null ';' - -%{_fixperms} %{buildroot}/* +%{_fixperms} %{buildroot} -# make sure this goes where it should to be... +# We're having this as %%doc mv %{buildroot}%{perl_vendorlib}/benchmark.pl . - %check make test - %clean rm -rf %{buildroot} - %files %defattr(-,root,root,-) -%doc Changes README benchmark.pl +%doc Changes README benchmark.pl t/ %{perl_vendorlib}/Readonly.pm -%{_mandir}/man3/* - +%{_mandir}/man3/Readonly.3pm* %changelog +* Thu Mar 1 2012 Paul Howarth <paul@xxxxxxxxxxxx> - 1.03-18 +- Drop -tests subpackage (general lack of interest in this), but include + them as documentation for the main package +- No need to remove empty directories from buildroot +- Add buildreqs for Perl core modules that might be dual-lived +- Fix script interpreter for test suite since we're packaging it +- Drop redundant %%{?perl_default_filter} +- Don't use macros for commands +- Make %%files list more explicit +- Use tabs + * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 1.03-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild @@ -81,17 +88,17 @@ rm -rf %{buildroot} - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild * Tue Dec 21 2010 Marcela Maslanova <mmaslano@xxxxxxxxxx> - 1.03-14 -- 661697 rebuild for fixing problems with vendorach/lib +- Rebuild to fix problems with vendorarch/lib (#661697) * Thu May 06 2010 Marcela Maslanova <mmaslano@xxxxxxxxxx> - 1.03-13 - Mass rebuild with perl-5.12.0 -* Sun Feb 21 2010 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> 1.03-12 -- add perl_default_filter, etc -- minor spec updates +* Sun Feb 21 2010 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> - 1.03-12 +- Add perl_default_filter, etc +- Minor spec updates * Mon Dec 7 2009 Stepan Kasal <skasal@xxxxxxxxxx> - 1.03-11 -- rebuild against perl 5.10.1 +- Rebuild against perl 5.10.1 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 1.03-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild @@ -102,34 +109,34 @@ rm -rf %{buildroot} * Wed Feb 27 2008 Tom "spot" Callaway <tcallawa@xxxxxxxxxx> - 1.03-8 - Rebuild for perl 5.10 (again) -* Mon Jan 14 2008 Tom "spot" Callaway <tcallawa@xxxxxxxxxx> 1.03-7 -- rebuild for new perl +* Mon Jan 14 2008 Tom "spot" Callaway <tcallawa@xxxxxxxxxx> - 1.03-7 +- Rebuild for new perl -* Tue Oct 16 2007 Tom "spot" Callaway <tcallawa@xxxxxxxxxx> 1.03-6.2 -- add BR: perl(Test::More) +* Tue Oct 16 2007 Tom "spot" Callaway <tcallawa@xxxxxxxxxx> - 1.03-6.2 +- Add BR: perl(Test::More) -* Tue Oct 16 2007 Tom "spot" Callaway <tcallawa@xxxxxxxxxx> 1.03-6.1 -- correct license tag -- add BR: perl(ExtUtils::MakeMaker) +* Tue Oct 16 2007 Tom "spot" Callaway <tcallawa@xxxxxxxxxx> - 1.03-6.1 +- Correct license tag +- Add BR: perl(ExtUtils::MakeMaker) -* Wed Oct 04 2006 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> 1.03-6 -- add explict requires on perl(Readonly::XS). perl(Readonly::XS) is available - for all architectures fedora supports, so there's no good reason to not - require it. -- spec file rework +* Wed Oct 04 2006 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> - 1.03-6 +- Add explict requires on perl(Readonly::XS); perl(Readonly::XS) is available + for all architectures Fedora supports, so there's no good reason to not + require it +- Spec file rework -* Tue Sep 19 2006 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> 1.03-5 -- bump for mass rebuild +* Tue Sep 19 2006 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> - 1.03-5 +- Bump for mass rebuild -* Thu Dec 08 2005 Michael A. Peters <mpeters@xxxxxxx> - 1.03-3 +* Thu Dec 08 2005 Michael A. Peters <mpeters@xxxxxxx> - 1.03-4 - Remove requires on perl-Readonly-XS * Thu Dec 08 2005 Michael A. Peters <mpeters@xxxxxxx> - 1.03-3 -- Fix license and BuildRequires, use %%{?_smp_mflags} with make, +- Fix license and BuildRequires, use %%{?_smp_mflags} with make * Sat Nov 12 2005 Michael A. Peters <mpeters@xxxxxxx> - 1.03-2 -- separate out perl-Readonly-XS into its own package -- package benchmark.pl as a doc +- Separate out perl-Readonly-XS into its own package +- Package benchmark.pl as a doc * Mon Nov 7 2005 Michael A. Peters <mpeters@xxxxxxx> - 1.03-1 - Initial spec file -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/perl-devel