From af1e231a029af4795af9d00647ddd4770f405f3b Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Sun, 24 May 2009 23:45:45 +0000 Subject: [PATCH] - drop verbose.patch: largely supersceded - auto-update to 0.08102 (by cpan-spec-update 0.01) - added a new br on perl(MRO::Compat) (version 0.09) - added a new br on perl(Test::Warn) (version 0.11) - altered br on perl(SQL::Abstract) (1.24 => 1.51) - added a new br on perl(Sub::Name) (version 0.04) - altered br on perl(Test::Builder) (0.32 => 0.33) - altered br on perl(Class::C3::Componentised) (0 => 1.0005) - altered br on perl(Class::Accessor::Grouped) (0.08002 => 0.08003) - added a new br on perl(Path::Class) (version 0) --- .cvsignore | 2 +- perl-DBIx-Class.spec | 74 +++++++++++++++++++++++++------------------- sources | 2 +- verbose.patch | 38 ----------------------- 4 files changed, 44 insertions(+), 72 deletions(-) delete mode 100644 verbose.patch diff --git a/.cvsignore b/.cvsignore index 832707b..7d752a3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -DBIx-Class-0.08012.tar.gz +DBIx-Class-0.08102.tar.gz diff --git a/perl-DBIx-Class.spec b/perl-DBIx-Class.spec index 623151e..0a0ce3a 100644 --- a/perl-DBIx-Class.spec +++ b/perl-DBIx-Class.spec @@ -1,48 +1,44 @@ -%define _default_patch_fuzz 2 +%define _default_patch_fuzz 2 Name: perl-DBIx-Class -Version: 0.08012 -Release: 3%{?dist} +Version: 0.08102 +Release: 1%{?dist} Summary: Extensible and flexible object <-> relational mapper License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/DBIx-Class/ -Source0: http://www.cpan.org/authors/id/R/RI/RIBASUSHI/DBIx-Class-%{version}.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/R/RI/RIBASUSHI/DBIx-Class-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -## patches... -# make tests skip a little more verbosely -Patch3: verbose.patch - # core BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(Scalar::Util) -BuildRequires: perl(Storable) -BuildRequires: perl(Test::Builder) >= 0.32 +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42 +BuildRequires: perl(Scalar::Util) +BuildRequires: perl(Storable) +BuildRequires: perl(Test::Builder) >= 0.33 BuildRequires: perl(Test::Deep) ## Dependencies -BuildRequires: perl(Carp::Clan) -BuildRequires: perl(Class::Accessor::Grouped) >= 0.08002 +BuildRequires: perl(Carp::Clan) +BuildRequires: perl(Class::Accessor::Grouped) >= 0.08003 BuildRequires: perl(Class::C3) >= 0.2 -BuildRequires: perl(Class::C3::Componentised) +BuildRequires: perl(Class::C3::Componentised) >= 1.0005 # for CDBI-compat bits... BuildRequires: perl(Class::Data::Inheritable) -BuildRequires: perl(Class::Inspector) -BuildRequires: perl(Class::Trigger) +BuildRequires: perl(Class::Inspector) +BuildRequires: perl(Class::Trigger) BuildRequires: perl(Data::Page) >= 2 # see BZ#245699 -- requires patched version, not CPAN BuildRequires: perl(DBD::SQLite) >= 1.13 BuildRequires: perl(DBI) >= 1.4 -BuildRequires: perl(DBIx::ContextualFetch) -BuildRequires: perl(JSON::Any) >= 1.17 +BuildRequires: perl(DBIx::ContextualFetch) +BuildRequires: perl(JSON::Any) >= 1.17 BuildRequires: perl(List::Util) >= 1.19 BuildRequires: perl(Module::Find) BuildRequires: perl(Scope::Guard) >= 0.03 -BuildRequires: perl(SQL::Abstract) >= 1.24 +BuildRequires: perl(SQL::Abstract) >= 1.51 # darn RPM version compares... #BuildRequires: perl(SQL::Abstract::Limit) >= 0.13 BuildRequires: perl(SQL::Abstract::Limit) >= 0.13 @@ -64,10 +60,16 @@ Requires: perl(Class::Accessor::Grouped) >= 0.05002 Requires: perl(Class::C3::Componentised) Requires: perl(SQL::Abstract) >= 1.2 -# not picked up automagically (yet)... +# not picked up automagically (yet)... Provides: perl(DBIx::Class::ClassResolver::PassThrough) = 0 Provides: perl(DBIx::Class::Storage::TxnScopeGuard) = 0 +### auto-added brs! +BuildRequires: perl(MRO::Compat) >= 0.09 +BuildRequires: perl(Test::Warn) >= 0.11 +BuildRequires: perl(Sub::Name) >= 0.04 +BuildRequires: perl(Path::Class) + %description This is an SQL to OO mapper with an object API inspired by Class::DBI (and a compatibility layer as a springboard for porting) and a @@ -81,24 +83,20 @@ DISTINCT, GROUP BY and HAVING support. %prep %setup -q -n DBIx-Class-%{version} -# tell us why we're skipping, eh? -%patch3 - find t/ -type f -exec perl -pi -e 's|\r||; s|^#!perl|#!/usr/bin/perl|' {} + find . -type f -exec chmod -c -x {} + find t/ -type f -name '*.orig' -exec rm -v {} + # utf8 issues -BAD='README ./lib/DBIx/Class/Storage/DBI/Replication.pm ./lib/DBIx/Class.pm' -for i in $BAD ; do +for i in `find . -type f` ; do iconv -f iso8859-1 -t UTF-8 $i > foo - mv foo $i + mv foo $i done # Filter unwanted Provides: cat << \EOF > %{name}-prov #!/bin/sh -%{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'` +%{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'` EOF %define __perl_provides %{_builddir}/DBIx-Class-%{version}/%{name}-prov @@ -108,7 +106,7 @@ chmod +x %{__perl_provides} cat << \EOF > %{name}-req #!/bin/sh %{__perl_requires} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'` |\ - sed -e '/perl(DBD::Pg)/d' + sed -e '/perl(DBD::Pg)/d' EOF %define __perl_requires %{_builddir}/DBIx-Class-%{version}/%{name}-req @@ -123,7 +121,7 @@ rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} -find %{buildroot} -type f -name .packlist -exec rm -f {} + +find %{buildroot} -type f -name .packlist -exec rm -f {} + find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* @@ -137,13 +135,25 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc Changes README t/ +%doc Changes README examples/ t/ %{perl_vendorlib}/* %{_bindir}/* %{_mandir}/man[13]/* %changelog +* Sun May 24 2009 Chris Weyl 0.08102-1 +- drop verbose.patch: largely supersceded +- auto-update to 0.08102 (by cpan-spec-update 0.01) +- added a new br on perl(MRO::Compat) (version 0.09) +- added a new br on perl(Test::Warn) (version 0.11) +- altered br on perl(SQL::Abstract) (1.24 => 1.51) +- added a new br on perl(Sub::Name) (version 0.04) +- altered br on perl(Test::Builder) (0.32 => 0.33) +- altered br on perl(Class::C3::Componentised) (0 => 1.0005) +- altered br on perl(Class::Accessor::Grouped) (0.08002 => 0.08003) +- added a new br on perl(Path::Class) (version 0) + * Sun Mar 22 2009 Robert Scheck 0.08012-3 - Added missing build requirement perl(Test::Deep) for make tests - Re-diffed make tests patch for more verbosity when skipping tests @@ -155,7 +165,7 @@ rm -rf %{buildroot} - update to 0.08012 * Thu Oct 16 2008 Chris Weyl 0.08010-9 -- stop filtering perl(DBD::Multi) +- stop filtering perl(DBD::Multi) * Sun Oct 05 2008 Chris Weyl 0.08010-8 - filter all prov/req from anything under _docdir diff --git a/sources b/sources index cef230f..e233d41 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8d8c526f812d6213a04c6644d52a44b1 DBIx-Class-0.08012.tar.gz +b264dff25843c2a83d1bc7fa5ff96479 DBIx-Class-0.08102.tar.gz diff --git a/verbose.patch b/verbose.patch deleted file mode 100644 index c27283a..0000000 --- a/verbose.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- t/86sqlt.t 2009-02-11 00:33:56.000000000 +0100 -+++ t/86sqlt.t.verbose 2009-03-22 18:52:18.000000000 +0100 -@@ -6,7 +6,7 @@ - use DBICTest; - - eval "use SQL::Translator"; --plan skip_all => 'SQL::Translator required' if $@; -+plan skip_all => "SQL::Translator required: $@" if $@; - - my $schema = DBICTest->init_schema; - ---- t/94versioning.t 2009-02-11 00:33:56.000000000 +0100 -+++ t/94versioning.t.verbose 2009-03-22 18:52:47.000000000 +0100 -@@ -7,7 +7,7 @@ - BEGIN { - eval "use DBD::SQLite; use SQL::Translator 0.09003;"; - plan $@ -- ? ( skip_all => 'needs DBD::SQLite and SQL::Translator 0.09003 for testing' ) -+ ? ( skip_all => "needs DBD::SQLite and SQL::Translator 0.09003 for testing: $@" ) - : ( tests => 6 ); - } - ---- t/cdbi-t/03-subclassing.t 2009-02-11 00:33:49.000000000 +0100 -+++ t/cdbi-t/03-subclassing.t.verbose 2009-03-22 18:53:24.000000000 +0100 -@@ -8,11 +8,11 @@ - BEGIN { - eval "use DBIx::Class::CDBICompat;"; - if ($@) { -- plan (skip_all => 'Class::Trigger and DBIx::ContextualFetch required'); -+ plan (skip_all => "Class::Trigger and DBIx::ContextualFetch required: $@"); - next; - } - eval "use DBD::SQLite"; -- plan $@ ? (skip_all => 'needs DBD::SQLite for testing') : (tests => 6); -+ plan $@ ? (skip_all => "needs DBD::SQLite for testing: $@") : (tests => 6); - } - - use lib 't/testlib';