diff --git a/.cvsignore b/.cvsignore index 794c7ed..01dc480 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -DBIx-Class-0.08112.tar.gz +DBIx-Class-0.08120.tar.gz diff --git a/auto.ini b/auto.ini new file mode 100644 index 0000000..3632078 --- /dev/null +++ b/auto.ini @@ -0,0 +1,31 @@ +[add_build_requires] +; FIXME -- these all need to be rechecked to ensure that we're not just +; duplicating the find_optional_requires script +; +; optional tests +perl(DateTime::Format::MySQL)=0 +perl(Text::CSV_XS)=0 +perl(Test::Memory::Cycle)=0 +perl(Test::Pod)=0 +perl(Test::Pod::Coverage)=0 +perl(SQL::Translator)=0 +perl(DateTime)=0 +perl(DateTime::Format::Oracle)=0 +perl(DBIx::ContextualFetch)=0 +; optional tests as of 0.08102 +perl(Clone)=0 +perl(Time::Piece)=0 +perl(Time::Piece::MySQL)=0 +; .. the following are also needed as a requires for replicated dbd support +perl(MooseX::AttributeHelpers)=0.12 +perl(Class::MOP)=0.63 +perl(Moose)=0.54 +perl(Moose::Util::TypeConstraints)=0.54 +; CDBI-compat tests... +perl(Class::Data::Inheritable)=0 +perl(Class::Inspector)=1.24 +perl(Class::Trigger)=0 + +[metadata_filtering] +; this wouldn't be an issue if we'd filter dupes in perl_default_filter +filter_from_requires=/^perl(DBD::Pg)$/d diff --git a/find_optional_deps b/find_optional_deps new file mode 100755 index 0000000..74e31f6 --- /dev/null +++ b/find_optional_deps @@ -0,0 +1,42 @@ +#!/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; + +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 2ec7327..610637a 100644 --- a/perl-DBIx-Class.spec +++ b/perl-DBIx-Class.spec @@ -1,106 +1,111 @@ Name: perl-DBIx-Class -Version: 0.08112 -Release: 2%{?dist} Summary: Extensible and flexible object <-> relational mapper +Version: 0.08119 +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 URL: http://search.cpan.org/dist/DBIx-Class/ -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)) +BuildArch: noarch -# core BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42 -BuildRequires: perl(Scalar::Util) -BuildRequires: perl(Storable) -BuildRequires: perl(Test::Builder) >= 0.33 -BuildRequires: perl(Test::Deep) - -# Required by inc/Module/AutoInstall -BuildRequires: perl(CPAN) - -## Dependencies BuildRequires: perl(Carp::Clan) >= 6.0 -BuildRequires: perl(Class::Accessor::Grouped) >= 0.09000 -BuildRequires: perl(Class::C3) >= 0.2 +BuildRequires: perl(Class::Accessor::Grouped) >= 0.09002 BuildRequires: perl(Class::C3::Componentised) >= 1.0005 -# for CDBI-compat bits... BuildRequires: perl(Class::Data::Inheritable) BuildRequires: perl(Class::Inspector) >= 1.24 +BuildRequires: perl(Class::MOP) >= 0.63 BuildRequires: perl(Class::Trigger) +BuildRequires: perl(Clone) +BuildRequires: perl(CPAN) +BuildRequires: perl(Data::Dumper::Concise) >= 1.000 BuildRequires: perl(Data::Page) >= 2.00 +BuildRequires: perl(DateTime) +BuildRequires: perl(DateTime::Format::MySQL) +BuildRequires: perl(DateTime::Format::Oracle) BuildRequires: perl(DBD::SQLite) >= 1.25 -BuildRequires: perl(DBI) >= 1.605 +BuildRequires: perl(DBI) >= 1.609 BuildRequires: perl(DBIx::ContextualFetch) -BuildRequires: perl(JSON::Any) >= 1.18 +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42 +BuildRequires: perl(File::Temp) >= 0.22 BuildRequires: perl(List::Util) >= 1.19 BuildRequires: perl(Module::Find) >= 0.06 +BuildRequires: perl(Moose) >= 0.54 +BuildRequires: perl(Moose::Util::TypeConstraints) >= 0.54 +BuildRequires: perl(MooseX::AttributeHelpers) >= 0.12 +BuildRequires: perl(MRO::Compat) >= 0.09 +BuildRequires: perl(Path::Class) >= 0.18 +BuildRequires: perl(Scalar::Util) BuildRequires: perl(Scope::Guard) >= 0.03 -BuildRequires: perl(SQL::Abstract) >= 1.58 +BuildRequires: perl(SQL::Abstract) >= 1.61 BuildRequires: perl(SQL::Abstract::Limit) >= 0.13 +BuildRequires: perl(SQL::Translator) +BuildRequires: perl(Storable) +BuildRequires: perl(Sub::Name) >= 0.04 +BuildRequires: perl(Test::Builder) >= 0.33 +BuildRequires: perl(Test::Deep) BuildRequires: perl(Test::Exception) -# optional tests -BuildRequires: perl(DateTime::Format::MySQL) -BuildRequires: perl(Text::CSV_XS) BuildRequires: perl(Test::Memory::Cycle) +BuildRequires: perl(Test::More) >= 0.92 BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) -BuildRequires: perl(SQL::Translator) -BuildRequires: perl(DateTime) -BuildRequires: perl(DateTime::Format::Oracle) -BuildRequires: perl(DBIx::ContextualFetch) -# optional tests as of 0.08102 -BuildRequires: perl(Clone) +BuildRequires: perl(Test::Warn) >= 0.21 +BuildRequires: perl(Text::CSV_XS) BuildRequires: perl(Time::Piece) BuildRequires: perl(Time::Piece::MySQL) -# .. the following are also needed as a requires for replicated dbd support -BuildRequires: perl(MooseX::AttributeHelpers) >= 0.12 -BuildRequires: perl(Class::MOP) >= 0.63 -BuildRequires: perl(Moose) >= 0.54 -BuildRequires: perl(Moose::Util::TypeConstraints) >= 0.54 - -BuildRequires: perl(Test::More) >= 0.92 -BuildRequires: perl(MRO::Compat) >= 0.09 -BuildRequires: perl(Test::Warn) >= 0.21 -BuildRequires: perl(Sub::Name) >= 0.04 -BuildRequires: perl(Path::Class) >= 0.16 -# these are hidden from PAUSE, yet picked up by us -Provides: perl(DBIx::Class::ClassResolver::PassThrough) = 0 -Provides: perl(DBIx::Class::CDBICompat::Relationship) = 0 -Provides: perl(DBIx::Class::Storage::DBI::Replicated::Types) = 0 - -# not picked up... -Requires: perl(Class::Accessor::Grouped) >= 0.09000 +Requires: perl(Carp::Clan) >= 6.0 +Requires: perl(Class::Accessor::Grouped) >= 0.09002 Requires: perl(Class::C3::Componentised) >= 1.0005 -Requires: perl(SQL::Abstract) >= 1.58 - -### auto-added reqs! -Requires: perl(Carp::Clan) >= 6.0 -Requires: perl(Class::Inspector) >= 1.24 -Requires: perl(DBD::SQLite) >= 1.25 -Requires: perl(DBI) >= 1.605 -Requires: perl(Data::Page) >= 2.00 -Requires: perl(JSON::Any) >= 1.18 -Requires: perl(List::Util) -Requires: perl(MRO::Compat) >= 0.09 -Requires: perl(Module::Find) >= 0.06 -Requires: perl(Path::Class) >= 0.16 -Requires: perl(SQL::Abstract::Limit) >= 0.13 -Requires: perl(Scalar::Util) -Requires: perl(Scope::Guard) >= 0.03 -Requires: perl(Storable) -Requires: perl(Sub::Name) >= 0.04 - -%{?perl_default_filter: -%filter_from_requires /^perl(DBD::Pg)/d -%perl_default_filter -} - -### auto-added brs! -BuildRequires: perl(File::Temp) >= 0.22 +Requires: perl(Class::Inspector) >= 1.24 +Requires: perl(Data::Dumper::Concise) >= 1.000 +Requires: perl(Data::Page) >= 2.00 +Requires: perl(DBI) >= 1.609 +Requires: perl(List::Util) >= 1.19 +Requires: perl(Module::Find) >= 0.06 +Requires: perl(MRO::Compat) >= 0.09 +Requires: perl(Path::Class) >= 0.18 +Requires: perl(Scalar::Util) +Requires: perl(Scope::Guard) >= 0.03 +Requires: perl(SQL::Abstract) >= 1.61 +Requires: perl(SQL::Abstract::Limit) >= 0.13 +Requires: perl(Storable) +Requires: perl(Sub::Name) >= 0.04 + +### Additional generated deps. These deps are regenerated from scratch every +### time this spec file is updated. +# optional deps for group: core +BuildRequires: perl(DateTime::Format::SQLite) +BuildRequires: perl(DateTime::Format::Strptime) +BuildRequires: perl(Devel::Cycle) >= 1.10 +BuildRequires: perl(Test::Memory::Cycle) +# optional deps for group: cdbicompat +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(Time::Piece::MySQL) +# optional deps for group: deploy +BuildRequires: perl(SQL::Translator) >= 0.11002 +# optional deps for group: admin +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(namespace::autoclean) >= 0.09 +# optional deps for group: replicated +BuildRequires: perl(Hash::Merge) >= 0.11 +BuildRequires: perl(Moose) >= 0.98 +BuildRequires: perl(MooseX::Types) >= 0.21 +BuildRequires: perl(namespace::clean) >= 0.11 + +%{?filter_from_requires: %filter_from_requires /^perl(DBD::Pg)/d } +%{?perl_default_filter} +%{?perl_default_subpackage_tests} %description This is an SQL to OO mapper with an object API inspired by Class::DBI @@ -132,7 +137,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 \; @@ -152,13 +157,40 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc Changes README examples/ t/ +%doc Changes README examples/ %{perl_vendorlib}/* %{_bindir}/* %{_mandir}/man[13]/* %changelog +* Tue Feb 23 2010 Chris Weyl 0.08119-1 +- update by Fedora::App::MaintainerTools 0.003 +- PERL_INSTALL_ROOT => DESTDIR +- altered br on perl(Path::Class) (0.16 => 0.18) +- dropped old BR on perl(Class::C3) +- dropped old BR on perl(JSON::Any) +- altered req on perl(Path::Class) (0.16 => 0.18) +- dropped old requires on perl(DBD::SQLite) +- dropped old requires on perl(JSON::Any) +- additional deps script run; 26 deps found + +* Sun Feb 07 2010 Chris Weyl 0.08117-1 +- auto-update to 0.08117 (by cpan-spec-update 0.01) +- altered br on perl(Class::Accessor::Grouped) (0.09000 => 0.09002) +- altered br on perl(DBI) (1.605 => 1.609) +- altered br on perl(SQL::Abstract) (1.60 => 1.61) +- altered req on perl(Class::Accessor::Grouped) (0.09000 => 0.09002) +- altered req on perl(DBI) (1.605 => 1.609) +- altered req on perl(SQL::Abstract) (1.60 => 1.61) + +* Sat Feb 06 2010 Chris Weyl 0.08115-1 +- auto-update to 0.08115 (by cpan-spec-update 0.01) +- added a new br on perl(Data::Dumper::Concise) (version 1.000) +- altered br on perl(SQL::Abstract) (1.58 => 1.60) +- added a new req on perl(Data::Dumper::Concise) (version 1.000) +- altered req on perl(SQL::Abstract) (1.58 => 1.60) + * Tue Jan 19 2010 Chris Weyl 0.08112-2 - bump diff --git a/sources b/sources index 10c5683..39c2feb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bf4f4dd040c5f994606c33ee5fcdc9f6 DBIx-Class-0.08112.tar.gz +8159c0841f9d21fbec368d038c1fdf65 DBIx-Class-0.08119.tar.gz