From 8766b3a6bcfc62ffd3d5cf9a8d944495121a1726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Fri, 5 Dec 2014 13:09:46 +0100 Subject: [PATCH] 0.082810 bump - Massive dependency lists rewrite - Let's be consistent and provide all the hidden modules, not just some --- .gitignore | 1 + ...-regex-anchor-mistake-from-66137dffe.patch | 47 --- ...e-changed-their-exception-text-again.patch | 67 ---- ...dered-in-combination-with-delete_all.patch | 144 ------- auto.ini | 12 - find_optional_deps | 44 -- perl-DBIx-Class.spec | 376 +++++++++++------- sources | 2 +- 8 files changed, 241 insertions(+), 452 deletions(-) delete mode 100644 DBIx-Class-0.08250-Fix-ridiculous-regex-anchor-mistake-from-66137dffe.patch delete mode 100644 DBIx-Class-0.08250-SQLite-changed-their-exception-text-again.patch delete mode 100644 DBIx-Class-0.08270-Fix-Ordered-in-combination-with-delete_all.patch delete mode 100644 auto.ini delete mode 100755 find_optional_deps diff --git a/.gitignore b/.gitignore index 09c38e7..67fb3c5 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ DBIx-Class-0.08120.tar.gz /DBIx-Class-0.08205.tar.gz /DBIx-Class-0.08206.tar.gz /DBIx-Class-0.08250.tar.gz +/DBIx-Class-0.082810.tar.gz diff --git a/DBIx-Class-0.08250-Fix-ridiculous-regex-anchor-mistake-from-66137dffe.patch b/DBIx-Class-0.08250-Fix-ridiculous-regex-anchor-mistake-from-66137dffe.patch deleted file mode 100644 index 0f54950..0000000 --- a/DBIx-Class-0.08250-Fix-ridiculous-regex-anchor-mistake-from-66137dffe.patch +++ /dev/null @@ -1,47 +0,0 @@ -From d0654b22afaa59929f82f68793c8b7885e966484 Mon Sep 17 00:00:00 2001 -From: Peter Rabbitson -Date: Sun, 19 Jan 2014 12:39:28 +0100 -Subject: [PATCH] Fix ridiculous regex anchor mistake from 66137dffe -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Petr Písař - -Petr Pisar: Ported to 0.08250. - -Signed-off-by: Petr Písař ---- - Makefile.PL | 2 +- - lib/DBIx/Class/SQLMaker.pm | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.PL b/Makefile.PL -index c86103a..7817114 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -77,7 +77,7 @@ my $runtime_requires = { - 'namespace::clean' => '0.24', - 'Path::Class' => '0.18', - 'Scope::Guard' => '0.03', -- 'SQL::Abstract' => '1.73', -+ 'SQL::Abstract' => '1.77', - 'Try::Tiny' => '0.07', - - # Technically this is not a core dependency - it is only required -diff --git a/lib/DBIx/Class/SQLMaker.pm b/lib/DBIx/Class/SQLMaker.pm -index 14fbb29..31ea037 100644 ---- a/lib/DBIx/Class/SQLMaker.pm -+++ b/lib/DBIx/Class/SQLMaker.pm -@@ -512,7 +512,7 @@ sub _where_op_multicolumn_in { - - for ($lhs, $rhs) { - $$_->[0] = "( $$_->[0] )" -- unless $$_->[0] =~ /^ \s* \( .* \) \s* ^/xs; -+ unless $$_->[0] =~ /^ \s* \( .* \) \s* $/xs; - } - - \[ join( ' IN ', shift @$$lhs, shift @$$rhs ), @$$lhs, @$$rhs ]; --- -1.9.0 - diff --git a/DBIx-Class-0.08250-SQLite-changed-their-exception-text-again.patch b/DBIx-Class-0.08250-SQLite-changed-their-exception-text-again.patch deleted file mode 100644 index 61811ba..0000000 --- a/DBIx-Class-0.08250-SQLite-changed-their-exception-text-again.patch +++ /dev/null @@ -1,67 +0,0 @@ -From ed5550d36c5771dfb5492b23127f8af9e38254d4 Mon Sep 17 00:00:00 2001 -From: Peter Rabbitson -Date: Mon, 13 Jan 2014 12:49:53 +0100 -Subject: [PATCH] SQLite changed their exception text again -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Petr Písař - -Ported to 0.08250. - -diff --git a/t/multi_create/standard.t b/t/multi_create/standard.t -index 5a02947..6c1efd8 100644 ---- a/t/multi_create/standard.t -+++ b/t/multi_create/standard.t -@@ -444,7 +444,11 @@ throws_ok ( sub { - #$t->cd($t->new_related('cd', { artist => undef } ) ); - #$t->{_rel_in_storage} = 0; - $t->insert; --}, qr/cd.artist may not be NULL/, "Exception propogated properly"); -+}, qr/DBI Exception.+(?x: -+ \QNOT NULL constraint failed: cd.artist\E -+ | -+ \Qcd.artist may not be NULL\E -+)/s, "Exception propogated properly"); - - lives_ok ( sub { - $schema->resultset('CD')->create ({ -diff --git a/t/relationship/update_or_create_multi.t b/t/relationship/update_or_create_multi.t -index 8710048..c7cce7a 100644 ---- a/t/relationship/update_or_create_multi.t -+++ b/t/relationship/update_or_create_multi.t -@@ -69,7 +69,12 @@ throws_ok { - year => 2020, - title => 'the best thing since sliced bread', - }) --} qr/\Qcd.artist may not be NULL/, 'ambiguous find + create failed'; -+} qr/DBI Exception.+(?x: -+ \QNOT NULL constraint failed: cd.artist\E -+ | -+ \Qcd.artist may not be NULL\E -+)/s, 'ambiguous find + create failed' -+; - - # expect a create, after a failed search using *only* the - # *current* relationship and the unique column constraints -diff --git a/t/storage/error.t b/t/storage/error.t -index d5980eb..61d6782 100644 ---- a/t/storage/error.t -+++ b/t/storage/error.t -@@ -15,7 +15,11 @@ warnings_are ( sub { - sub { - $schema->resultset('CD')->create({ title => 'vacation in antarctica' }) - }, -- qr/DBI Exception.+cd\.artist.+NULL/s -+ qr/DBI Exception.+(?x: -+ \QNOT NULL constraint failed: cd.artist\E -+ | -+ \Qcd.artist may not be NULL\E -+ )/s - ); # as opposed to some other error - }, [], 'No warnings besides exception' ); - --- -1.9.0 - diff --git a/DBIx-Class-0.08270-Fix-Ordered-in-combination-with-delete_all.patch b/DBIx-Class-0.08270-Fix-Ordered-in-combination-with-delete_all.patch deleted file mode 100644 index aedd89a..0000000 --- a/DBIx-Class-0.08270-Fix-Ordered-in-combination-with-delete_all.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 72e545f8b77baec541e229d740308886f0598a82 Mon Sep 17 00:00:00 2001 -From: Peter Rabbitson -Date: Mon, 16 Jun 2014 16:15:44 +0200 -Subject: [PATCH] Fix ::Ordered in combination with delete_all -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -See pod-changes for description of the solution. I cringe but... oh well - -Petr Pisar: Ported to 0.08270. - -Signed-off-by: Petr Písař ---- - lib/DBIx/Class/Ordered.pm | 53 ++++++++++++++++++++++++++++++------------ - t/ordered/unordered_movement.t | 25 +++++++++++--------- - 2 files changed, 52 insertions(+), 26 deletions(-) - -diff --git a/lib/DBIx/Class/Ordered.pm b/lib/DBIx/Class/Ordered.pm -index 5e40dc0..a5db68b 100644 ---- a/lib/DBIx/Class/Ordered.pm -+++ b/lib/DBIx/Class/Ordered.pm -@@ -367,7 +367,30 @@ sub move_to { - - my $position_column = $self->position_column; - -- if ($self->is_column_changed ($position_column) ) { -+ my $is_txn; -+ if ($is_txn = $self->result_source->schema->storage->transaction_depth) { -+ # Reload position state from storage -+ # The thinking here is that if we are in a transaction, it is -+ # *more likely* the object went out of sync due to resultset -+ # level shenanigans. Instead of always reloading (slow) - go -+ # ahead and hand-hold only in the case of higher layers -+ # requesting the safety of a txn -+ -+ $self->store_column( -+ $position_column, -+ ( $self->result_source -+ ->resultset -+ ->search($self->_storage_ident_condition, { rows => 1, columns => $position_column }) -+ ->cursor -+ ->next -+ )[0] || $self->throw_exception( -+ sprintf "Unable to locate object '%s' in storage - object went ouf of sync...?", -+ $self->ID -+ ), -+ ); -+ delete $self->{_dirty_columns}{$position_column}; -+ } -+ elsif ($self->is_column_changed ($position_column) ) { - # something changed our position, we need to know where we - # used to be - use the stashed value - $self->store_column($position_column, delete $self->{_column_data_in_storage}{$position_column}); -@@ -380,7 +403,7 @@ sub move_to { - return 0; - } - -- my $guard = $self->result_source->schema->txn_scope_guard; -+ my $guard = $is_txn ? undef : $self->result_source->schema->txn_scope_guard; - - my ($direction, @between); - if ( $from_position < $to_position ) { -@@ -402,7 +425,7 @@ sub move_to { - $self->_shift_siblings ($direction, @between); - $self->_ordered_internal_update({ $position_column => $new_pos_val }); - -- $guard->commit; -+ $guard->commit if $guard; - return 1; - } - -@@ -861,18 +884,18 @@ will prevent such race conditions going undetected. - - =head2 Multiple Moves - --Be careful when issuing move_* methods to multiple objects. If --you've pre-loaded the objects then when you move one of the objects --the position of the other object will not reflect their new value --until you reload them from the database - see --L. -- --There are times when you will want to move objects as groups, such --as changing the parent of several objects at once - this directly --conflicts with this problem. One solution is for us to write a --ResultSet class that supports a parent() method, for example. Another --solution is to somehow automagically modify the objects that exist --in the current object's result set to have the new position value. -+If you have multiple same-group result objects already loaded from storage, -+you need to be careful when executing C operations on them: -+without a L reload the L of the -+"siblings" will be out of sync with the underlying storage. -+ -+Starting from version C<0.082800> DBIC will implicitly perform such -+reloads when the C happens as a part of a transaction -+(a good example of such situation is C<< $ordered_resultset->delete_all >>). -+ -+If it is not possible for you to wrap the entire call-chain in a transaction, -+you will need to call L to get an object -+up-to-date before proceeding, otherwise undefined behavior will result. - - =head2 Default Values - -diff --git a/t/ordered/unordered_movement.t b/t/ordered/unordered_movement.t -index 9cbc3da..dc08306 100644 ---- a/t/ordered/unordered_movement.t -+++ b/t/ordered/unordered_movement.t -@@ -9,19 +9,22 @@ use DBICTest; - my $schema = DBICTest->init_schema(); - - my $cd = $schema->resultset('CD')->next; -+$cd->tracks->delete; - --lives_ok { -- $cd->tracks->delete; -+$schema->resultset('CD')->related_resultset('tracks')->delete; - -- my @tracks = map -- { $cd->create_related('tracks', { title => "t_$_", position => $_ }) } -- (4,2,5,1,3) -- ; -+is $cd->tracks->count, 0, 'No tracks'; - -- for (@tracks) { -- $_->discard_changes; -- $_->delete; -- } --} 'Creation/deletion of out-of order tracks successful'; -+$cd->create_related('tracks', { title => "t_$_", position => $_ }) -+ for (4,2,3,1,5); -+ -+is $cd->tracks->count, 5, 'Created 5 tracks'; -+ -+# a txn should force the implicit pos reload, regardless of order -+$schema->txn_do(sub { -+ $cd->tracks->delete_all -+}); -+ -+is $cd->tracks->count, 0, 'Successfully deleted everything'; - - done_testing; --- -1.9.3 - diff --git a/auto.ini b/auto.ini deleted file mode 100644 index 3c8330c..0000000 --- a/auto.ini +++ /dev/null @@ -1,12 +0,0 @@ -[add_build_requires] -; optional tests -perl(Text::CSV_XS)=0 -perl(Class::Inspector)=1.24 -; -perl(Test::Moose)=0 - -[metadata_filtering] -; Note that maintainertool automatically generates filter macro statements for -; packages/directories marked as "no_index" in META.yml. -filter_from_requires=/^perl(DBD::Pg)$/d -filter_from_requires=/^perl(DBIx::Class::\(Admin\|CDBICompat\|ClassResolver\|Storage\)/d diff --git a/find_optional_deps b/find_optional_deps deleted file mode 100755 index b4c1ec3..0000000 --- a/find_optional_deps +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env perl -# -# Go and pull out of DBIx::Class::Optional::Dependencies all the "optional" -# and testing deps that aren't hardcoded in Makefile.PL. -# -# Chris Weyl 2010 - -use 5.010; - -use strict; -use warnings; - -# use the latest... -use lib "$ARGV[0]/lib"; -use DBIx::Class::Optional::Dependencies; - -# for use starting with DBIC 0.08120 -my %reqs = - %{ DBIx::Class::Optional::Dependencies::_all_optional_requirements() }; - -# output our found deps :) -say '# from DBIx::Class::Optional::Dependencies'; -say "BuildRequires: perl($_)" . ($reqs{$_} ? " >= $reqs{$_}" : q{}) - for sort keys %reqs; - -exit; - -my @groups = qw{ core cdbicompat deploy admin replicated }; - -sub _reqs { %{ DBIx::Class::Optional::Dependencies->req_list_for(@_) } } - -for my $group (@groups) { - - print "# optional deps for group: $group\n"; - my %reqs = _reqs($group); - - for my $dep (sort keys %reqs) { - - my $line = "BuildRequires: perl($dep)"; - $line .= " >= $reqs{$dep}" if $reqs{$dep}; - print "$line\n"; - } -} - diff --git a/perl-DBIx-Class.spec b/perl-DBIx-Class.spec index 46e4096..70c5efa 100644 --- a/perl-DBIx-Class.spec +++ b/perl-DBIx-Class.spec @@ -1,135 +1,253 @@ Name: perl-DBIx-Class Summary: Extensible and flexible object <-> relational mapper -Version: 0.08250 -Release: 8%{?dist} +Version: 0.082810 +Release: 1%{?dist} License: GPL+ or Artistic Group: Development/Libraries Source0: http://search.cpan.org/CPAN/authors/id/R/RI/RIBASUSHI/DBIx-Class-%{version}.tar.gz -# Adapt to new sqlite-3.8.2 exception messages, bug #1085336, CPAN RT#91947, -# in upstream version 0.08260 -Patch0: DBIx-Class-0.08250-SQLite-changed-their-exception-text-again.patch -# Adapt to changes in SQL-Abstract-1.77, bug #1099741, CPAN RT#92331, -# in upstream version 0.08260 -Patch1: DBIx-Class-0.08250-Fix-ridiculous-regex-anchor-mistake-from-66137dffe.patch -# Fix ::Ordered in combination with delete_all visible with sqlite 3.8.5, -# bug #1110272, CPAN RT#96499 -Patch2: DBIx-Class-0.08270-Fix-Ordered-in-combination-with-delete_all.patch URL: http://search.cpan.org/dist/DBIx-Class/ -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch - -BuildRequires: perl(Class::Accessor::Grouped) >= 0.10010 -BuildRequires: perl(Class::C3::Componentised) >= 1.0009 -BuildRequires: perl(Class::Inspector) >= 1.24 -BuildRequires: perl(Class::ISA) -BuildRequires: perl(Config::Any) >= 0.20 -BuildRequires: perl(Context::Preserve) >= 0.01 +# Build +BuildRequires: perl +BuildRequires: perl(Config) BuildRequires: perl(CPAN) -BuildRequires: perl(Data::Compare) >= 1.22 -BuildRequires: perl(Data::Dumper::Concise) >= 2.020 -BuildRequires: perl(Data::Page) >= 2.00 -BuildRequires: perl(DBD::SQLite) >= 1.29 -BuildRequires: perl(DBI) >= 1.609 +BuildRequires: perl(Cwd) +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 +BuildRequires: perl(ExtUtils::MM_Unix) +BuildRequires: perl(Fcntl) +BuildRequires: perl(File::Find) +BuildRequires: perl(File::Path) +BuildRequires: perl(File::Spec) +BuildRequires: perl(strict) +BuildRequires: perl(vars) +BuildRequires: perl(warnings) +# Runtime +BuildRequires: perl(B) +BuildRequires: perl(B::Deparse) +BuildRequires: perl(base) +BuildRequires: perl(Carp) +BuildRequires: perl(Class::Accessor::Grouped) +BuildRequires: perl(Class::C3::Componentised) +BuildRequires: perl(Class::Data::Inheritable) +BuildRequires: perl(Class::Inspector) +BuildRequires: perl(Class::Trigger) +BuildRequires: perl(Clone) +BuildRequires: perl(Config::Any) +BuildRequires: perl(constant) +BuildRequires: perl(Context::Preserve) +BuildRequires: perl(Data::Dumper) +BuildRequires: perl(Data::Dumper::Concise) +BuildRequires: perl(Data::Page) +BuildRequires: perl(DateTime::Format::Strptime) >= 1.2 +BuildRequires: perl(DBI) +BuildRequires: perl(DBI::Const::GetInfoReturn) +BuildRequires: perl(DBI::Const::GetInfoType) %if !0%{?perl_bootstrap} BuildRequires: perl(DBIx::Class::Storage::Debug::PrettyPrint) %endif -BuildRequires: perl(Devel::GlobalDestruction) >= 0.09 -BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42 -BuildRequires: perl(File::Spec) >= 3.30 -BuildRequires: perl(File::Temp) >= 0.22 +BuildRequires: perl(DBIx::ContextualFetch) +BuildRequires: perl(Devel::GlobalDestruction) +BuildRequires: perl(Digest::MD5) +BuildRequires: perl(Exporter) +BuildRequires: perl(File::Copy) +BuildRequires: perl(Getopt::Long::Descriptive) >= 0.081 +BuildRequires: perl(Getopt::Long::Descriptive::Usage) +BuildRequires: perl(Hash::Merge) +BuildRequires: perl(IO::Handle) +BuildRequires: perl(JSON::Any) >= 1.23 +BuildRequires: perl(List::Util) BuildRequires: perl(Math::Base36) >= 0.07 -BuildRequires: perl(Math::BigInt) >= 1.89 -BuildRequires: perl(Module::Find) >= 0.07 -BuildRequires: perl(Moo) >= 1.000006 -BuildRequires: perl(MRO::Compat) >= 0.12 -BuildRequires: perl(Package::Stash) >= 0.28 -BuildRequires: perl(Path::Class) >= 0.18 -BuildRequires: perl(Scope::Guard) >= 0.03 -BuildRequires: perl(SQL::Abstract) >= 1.77 -BuildRequires: perl(strictures) >= 1.003001 -BuildRequires: perl(Sub::Name) >= 0.04 -BuildRequires: perl(Test::Builder) >= 0.94 -BuildRequires: perl(Test::Deep) >= 0.101 -BuildRequires: perl(Test::Exception) >= 0.31 +BuildRequires: perl(Math::BigInt) >= 1.80 +BuildRequires: perl(Method::Generate::Accessor) +BuildRequires: perl(Method::Generate::Constructor) +BuildRequires: perl(Module::Find) +BuildRequires: perl(Moo) +BuildRequires: perl(Moo::Object) +BuildRequires: perl(Moose) >= 0.98 +BuildRequires: perl(Moose::Role) +BuildRequires: perl(MooseX::Types) >= 0.21 +BuildRequires: perl(MooseX::Types::JSON) >= 0.02 +BuildRequires: perl(MooseX::Types::LoadableClass) > 0.011 +BuildRequires: perl(MooseX::Types::Moose) +BuildRequires: perl(MooseX::Types::Path::Class) >= 0.05 +BuildRequires: perl(mro) +BuildRequires: perl(namespace::clean) +BuildRequires: perl(overload) +BuildRequires: perl(Path::Class) +BuildRequires: perl(POSIX) +BuildRequires: perl(Scalar::Util) +BuildRequires: perl(Scope::Guard) +BuildRequires: perl(SQL::Abstract) +BuildRequires: perl(SQL::Translator::Diff) +BuildRequires: perl(SQL::Translator::Schema::Constants) +BuildRequires: perl(SQL::Translator::Utils) +BuildRequires: perl(Storable) +BuildRequires: perl(Sub::Defer) +BuildRequires: perl(Sub::Name) +BuildRequires: perl(Sub::Quote) +BuildRequires: perl(Text::Balanced) +BuildRequires: perl(Time::HiRes) +BuildRequires: perl(Try::Tiny) +# Tests only +BuildRequires: perl(Benchmark) +BuildRequires: perl(Class::Accessor::Fast) +BuildRequires: perl(Class::DBI) +BuildRequires: perl(Class::DBI::Column) +BuildRequires: perl(Class::DBI::Plugin::DeepAbstractSearch) +BuildRequires: perl(Class::Unload) +BuildRequires: perl(Cpanel::JSON::XS) +BuildRequires: perl(Data::GUID) +BuildRequires: perl(Date::Simple) +BuildRequires: perl(DateTime) +BuildRequires: perl(DateTime::Format::MySQL) +BuildRequires: perl(DateTime::Format::Pg) +BuildRequires: perl(DateTime::Format::SQLite) +BuildRequires: perl(DBD::Pg) +BuildRequires: perl(DBD::SQLite) +BuildRequires: perl(Devel::FindRef) +BuildRequires: perl(Errno) +BuildRequires: perl(File::Compare) +BuildRequires: perl(File::Temp) +BuildRequires: perl(FileHandle) +BuildRequires: perl(FindBin) +BuildRequires: perl(IPC::Open2) +BuildRequires: perl(JSON) +#BuildRequires: perl(JSON::DWIW) +BuildRequires: perl(lib) +BuildRequires: perl(Module::Runtime) +BuildRequires: perl(Moose::Util) +BuildRequires: perl(Package::Stash) +BuildRequires: perl(Path::Class::File) +BuildRequires: perl(SQL::Abstract::Test) +BuildRequires: perl(SQL::Translator) >= 0.11018 +BuildRequires: perl(Test::Builder) +BuildRequires: perl(Test::Deep) +BuildRequires: perl(Test::Differences) +BuildRequires: perl(Test::Exception) BuildRequires: perl(Test::Moose) -BuildRequires: perl(Test::More) >= 0.94 -BuildRequires: perl(Test::Warn) >= 0.21 -BuildRequires: perl(Text::Balanced) >= 2.00 -BuildRequires: perl(Text::CSV_XS) -BuildRequires: perl(Try::Tiny) >= 0.07 - -Requires: perl(Class::Accessor::Grouped) >= 0.10007 -Requires: perl(Class::C3::Componentised) >= 1.0009 -Requires: perl(Class::Inspector) >= 1.24 -Requires: perl(Config::Any) >= 0.20 -Requires: perl(Context::Preserve) >= 0.01 -Requires: perl(Data::Compare) >= 1.22 -Requires: perl(Data::Dumper::Concise) >= 2.020 -Requires: perl(Data::Page) >= 2.00 -Requires: perl(DBI) >= 1.609 -Requires: perl(Module::Find) >= 0.06 -Requires: perl(MRO::Compat) >= 0.09 -Requires: perl(Path::Class) >= 0.18 -Requires: perl(Scope::Guard) >= 0.03 -Requires: perl(SQL::Abstract) >= 1.77 -Requires: perl(Sub::Name) >= 0.04 - -### Additional generated deps. These deps are regenerated from scratch every -### time this spec file is updated. -# from DBIx::Class::Optional::Dependencies -BuildRequires: perl(Class::DBI::Plugin::DeepAbstractSearch) -BuildRequires: perl(Class::Trigger) -BuildRequires: perl(Clone) -BuildRequires: perl(DBIx::ContextualFetch) -BuildRequires: perl(Date::Simple) >= 3.03 -BuildRequires: perl(DateTime::Format::MySQL) -BuildRequires: perl(DateTime::Format::Pg) -BuildRequires: perl(DateTime::Format::SQLite) -BuildRequires: perl(DateTime::Format::Strptime) -BuildRequires: perl(Devel::Cycle) >= 1.10 -BuildRequires: perl(Getopt::Long::Descriptive) >= 0.081 -BuildRequires: perl(Hash::Merge) >= 0.12 -BuildRequires: perl(JSON::Any) >= 1.22 -BuildRequires: perl(Moose) >= 0.98 -BuildRequires: perl(MooseX::Types) >= 0.21 -BuildRequires: perl(MooseX::Types::JSON) >= 0.02 -BuildRequires: perl(MooseX::Types::Path::Class) >= 0.05 -BuildRequires: perl(Pod::Coverage) >= 0.20 -BuildRequires: perl(SQL::Translator) >= 0.11005 -BuildRequires: perl(Test::Memory::Cycle) -BuildRequires: perl(Text::CSV) >= 1.16 -BuildRequires: perl(Time::Piece::MySQL) -BuildRequires: perl(namespace::autoclean) >= 0.09 -BuildRequires: perl(namespace::clean) >= 0.24 - -# obsolete/provide old tests subpackage -# can be removed during F19 development cycle -Obsoletes: %{name}-tests < 0.08196-2 -Provides: %{name}-tests = %{version}-%{release} - +BuildRequires: perl(Test::More) +BuildRequires: perl(Test::Warn) +BuildRequires: perl(Text::CSV) >= 1.16 +BuildRequires: perl(threads) +BuildRequires: perl(Time::Piece) +BuildRequires: perl(Time::Piece::MySQL) +BuildRequires: perl(YAML) +Requires: perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version)) +Requires: perl(B) +Requires: perl(B::Deparse) +Requires: perl(Config::Any) +Requires: perl(Data::Dumper) +Requires: perl(Data::Dumper::Concise) +Requires: perl(DateTime::Format::Strptime) >= 1.2 +Requires: perl(DBI::Const::GetInfoReturn) +Requires: perl(DBI::Const::GetInfoType) +Requires: perl(Digest::MD5) +Requires: perl(File::Spec) +Requires: perl(Getopt::Long::Descriptive) >= 0.081 +Requires: perl(JSON::Any) >= 1.23 +Requires: perl(Math::Base36) >= 0.07 +Requires: perl(Math::BigInt) >= 1.80 +Requires: perl(Method::Generate::Accessor) +Requires: perl(Method::Generate::Constructor) +Requires: perl(Module::Find) +Requires: perl(Moo) +Requires: perl(Moo::Object) +Requires: perl(Moose) >= 0.98 +Requires: perl(MooseX::Types) >= 0.21 +Requires: perl(MooseX::Types::JSON) >= 0.02 +Requires: perl(MooseX::Types::LoadableClass) > 0.011 +Requires: perl(MooseX::Types::Path::Class) >= 0.05 +Requires: perl(POSIX) +Requires: perl(SQL::Translator::Diff) +Requires: perl(Sub::Defer) +Requires: perl(Sub::Quote) +Requires: perl(Text::Balanced) # hidden from PAUSE -Provides: perl(DBIx::Class::ResultSource::RowParser) = %{version} -Provides: perl(DBIx::Class::ResultSource::RowParser::Util) = %{version} +Provides: perl(DBIx::Class::Admin::Descriptive) = %{version} +Provides: perl(DBIx::Class::Admin::Types) = %{version} +Provides: perl(DBIx::Class::Admin::Usage) = %{version} Provides: perl(DBIx::Class::Carp) = %{version} +Provides: perl(DBIx::Class::CDBICompat::AccessorMapping) = %{version} +Provides: perl(DBIx::Class::CDBICompat::AttributeAPI) = %{version} +Provides: perl(DBIx::Class::CDBICompat::AutoUpdate) = %{version} +Provides: perl(DBIx::Class::CDBICompat::ColumnCase) = %{version} +Provides: perl(DBIx::Class::CDBICompat::ColumnGroups::GrouperShim) = %{version} +Provides: perl(DBIx::Class::CDBICompat::ColumnGroups) = %{version} +Provides: perl(DBIx::Class::CDBICompat::Constraints) = %{version} +Provides: perl(DBIx::Class::CDBICompat::Constructor) = %{version} +Provides: perl(DBIx::Class::CDBICompat::Copy) = %{version} +Provides: perl(DBIx::Class::CDBICompat::DestroyWarning) = %{version} +Provides: perl(DBIx::Class::CDBICompat::GetSet) = %{version} +Provides: perl(DBIx::Class::CDBICompat::ImaDBI) = %{version} +Provides: perl(DBIx::Class::CDBICompat::LazyLoading) = %{version} +Provides: perl(DBIx::Class::CDBICompat::LiveObjectIndex) = %{version} +Provides: perl(DBIx::Class::CDBICompat::NoObjectIndex) = %{version} +Provides: perl(DBIx::Class::CDBICompat::Pager) = %{version} +Provides: perl(DBIx::Class::CDBICompat::ReadOnly) = %{version} +Provides: perl(DBIx::Class::CDBICompat::Relationships) = %{version} +Provides: perl(DBIx::Class::CDBICompat::Retrieve) = %{version} +Provides: perl(DBIx::Class::CDBICompat::Stringify) = %{version} +Provides: perl(DBIx::Class::CDBICompat::TempColumns) = %{version} +Provides: perl(DBIx::Class::CDBICompat::Triggers) = %{version} +Provides: perl(DBIx::Class::ClassResolver::PassThrough) = %{version} +Provides: perl(DBIx::Class::Componentised) = %{version} +Provides: perl(DBIx::Class::_ENV_) = %{version} +Provides: perl(DBIx::Class::PK::Auto::DB2) = %{version} +Provides: perl(DBIx::Class::PK::Auto::MSSQL) = %{version} +Provides: perl(DBIx::Class::PK::Auto::MySQL) = %{version} +Provides: perl(DBIx::Class::PK::Auto::Oracle) = %{version} +Provides: perl(DBIx::Class::PK::Auto::Pg) = %{version} +Provides: perl(DBIx::Class::PK::Auto::SQLite) = %{version} +Provides: perl(DBIx::Class::Relationship::Accessor) = %{version} +Provides: perl(DBIx::Class::Relationship::BelongsTo) = %{version} +Provides: perl(DBIx::Class::Relationship::CascadeActions) = %{version} +Provides: perl(DBIx::Class::Relationship::HasMany) = %{version} +Provides: perl(DBIx::Class::Relationship::HasOne) = %{version} +Provides: perl(DBIx::Class::Relationship::Helpers) = %{version} +Provides: perl(DBIx::Class::Relationship::ManyToMany) = %{version} +Provides: perl(DBIx::Class::Relationship::ProxyMethods) = %{version} +Provides: perl(DBIx::Class::ResultSet::Pager) = %{version} +Provides: perl(DBIx::Class::ResultSetProxy) = %{version} +Provides: perl(DBIx::Class::ResultSourceProxy) = %{version} +Provides: perl(DBIx::Class::ResultSource::RowParser::Util) = %{version} +Provides: perl(DBIx::Class::ResultSource::RowParser) = %{version} +Provides: perl(DBIx::Class::SQLAHacks::MSSQL) = %{version} +Provides: perl(DBIx::Class::SQLAHacks::MySQL) = %{version} +Provides: perl(DBIx::Class::SQLAHacks::OracleJoins) = %{version} +Provides: perl(DBIx::Class::SQLAHacks::Oracle) = %{version} +Provides: perl(DBIx::Class::SQLAHacks::SQLite) = %{version} +Provides: perl(DBIx::Class::SQLAHacks) = %{version} +Provides: perl(DBIx::Class::SQLMaker::ACCESS) = %{version} +Provides: perl(DBIx::Class::SQLMaker::MSSQL) = %{version} +Provides: perl(DBIx::Class::SQLMaker::MySQL) = %{version} +Provides: perl(DBIx::Class::SQLMaker::Oracle) = %{version} +Provides: perl(DBIx::Class::SQLMaker::SQLite) = %{version} +Provides: perl(DBIx::Class::Storage::BlockRunner) = %{version} +Provides: perl(DBIx::Class::Storage::DBI::ADO::CursorUtils) = %{version} +Provides: perl(DBIx::Class::Storage::DBI::ADO::Microsoft_SQL_Server::DateTime::Format) = %{version} +Provides: perl(DBIx::Class::Storage::DBI::ADO::MS_Jet::DateTime::Format) = %{version} +Provides: perl(DBIx::Class::Storage::DBIHacks) = %{version} +Provides: perl(DBIx::Class::Storage::DBI::Informix::DateTime::Format) = %{version} +Provides: perl(DBIx::Class::Storage::DBI::InterBase::DateTime::Format) = %{version} +Provides: perl(DBIx::Class::Storage::DBI::MSSQL::DateTime::Format) = %{version} +Provides: perl(DBIx::Class::Storage::DBI::ODBC::ACCESS::DateTime::Format) = %{version} +Provides: perl(DBIx::Class::Storage::DBI::Replicated::Types) = %{version} +Provides: perl(DBIx::Class::Storage::NESTED_ROLLBACK_EXCEPTION) = %{version} +Provides: perl(DBIx::Class::_Util) = %{version} +Provides: perl(DBIx::Class::VersionCompat) = %{version} +Provides: perl(DBIx::Class::Version::TableCompat) = %{version} +Provides: perl(DBIx::Class::Version::Table) = %{version} +Provides: perl(DBIx::Class::Version) = %{version} %?perl_default_filter -%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}perl\\(DBD::Pg\\)$ -%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}perl\\(DBD::Pg\\)$ -%global __requires_exclude %__requires_exclude|perl\\(DBIx::Class::(Admin|CDBICompat|ClassResolver|Storage|Componentised|ResultSourceProxy) -%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{perl_vendorlib}/DBIx/Class/Admin -%global __requires_exclude_from %{?__requires_exclude_from:%__requires_exclude_from|}%{perl_vendorlib}/DBIx/Class/Admin -%global __provides_exclude_from %__provides_exclude_from|%{perl_vendorlib}/DBIx/Class/CDBICompat -%global __requires_exclude_from %__provides_exclude_from|%{perl_vendorlib}/DBIx/Class/CDBICompat -%global __provides_exclude_from %__provides_exclude_from|%{perl_vendorlib}/DBIx/Class/PK/Auto -%global __requires_exclude_from %__provides_exclude_from|%{perl_vendorlib}/DBIx/Class/PK/Auto -%global __provides_exclude_from %__provides_exclude_from|%{perl_vendorlib}/DBIx/Class/SQLAHacks -%global __requires_exclude_from %__provides_exclude_from|%{perl_vendorlib}/DBIx/Class/SQLAHacks -%global __provides_exclude %__provides_exclude|perl\\(DBIx::Class::_Util\\) -%global __requires_exclude %__requires_exclude|perl\\(DBIx::Class::_Util\\) -%global __provides_exclude %__provides_exclude|perl\\(DBIx::Class::Storage::DBIHacks\\) -%global __requires_exclude %__requires_exclude|perl\\(DBIx::Class::Storage::DBIHacks\\) -%global __provides_exclude %__provides_exclude|perl\\(DBIx::Class::SQLMaker:: -%global __requires_exclude %__requires_exclude|perl\\(DBIx::Class::SQLMaker:: +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Getopt::Long::Descriptive\\)$ +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(JSON::Any\\)$ +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Moose\\)$ +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(MooseX::Types\\)$ +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(MooseX::Types::JSON\\)$ +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(MooseX::Types::LoadableClass\\)$ +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(MooseX::Types::Path::Class\\)$ + %description This is an SQL to OO mapper with an object API inspired by Class::DBI @@ -143,37 +261,18 @@ DISTINCT, GROUP BY and HAVING support. %prep %setup -q -n DBIx-Class-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 - -find t/ -type f -exec perl -pi -e 's|\r||; s|^#!perl|#!%{__perl}|' {} + -find . -type f -exec chmod -c -x {} + -find t/ -type f -name '*.orig' -exec rm -v {} + - -# utf8 issues -#for i in `find . -type f` ; do -# iconv -f iso8859-1 -t UTF-8 $i > foo -# mv foo $i -#done - chmod -c +x script/* - # skip dbic_pretty.t when bootstrapping %if 0%{?perl_bootstrap} rm t/storage/dbic_pretty.t %endif %build -%{__perl} Makefile.PL INSTALLDIRS=vendor +perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 make %{?_smp_mflags} %install 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}/* %check @@ -182,7 +281,6 @@ export DBICTEST_THREAD_STRESS=1 export DBICTEST_FORK_STRESS=1 export DBICTEST_STORAGE_STRESS=1 export DATA_DUMPER_TEST=1 - make test %files @@ -191,8 +289,12 @@ make test %{_bindir}/* %{_mandir}/man[13]/* - %changelog +* Fri Dec 05 2014 Petr Šabata - 0.082810-1 +- 0.082810 bump +- Massive dependency lists rewrite +- Let's be consistent and provide all the hidden modules, not just some + * Sun Sep 07 2014 Jitka Plesnikova - 0.08250-8 - Perl 5.20 re-rebuild of bootstrapped packages diff --git a/sources b/sources index 940bd24..534c73f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4f65022a3d9480f3bb0610580dfdaf56 DBIx-Class-0.08250.tar.gz +4edd211025600f870d6d7f42bbf3a5a4 DBIx-Class-0.082810.tar.gz