diff --git a/.gitignore b/.gitignore
index 794c7ed..01dc480 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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..3c8330c
--- /dev/null
+++ b/auto.ini
@@ -0,0 +1,12 @@
+[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
new file mode 100755
index 0000000..b4c1ec3
--- /dev/null
+++ b/find_optional_deps
@@ -0,0 +1,44 @@
+#!/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 <cweyl@alumni.drew.edu> 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 ad1ea79..c27b7d7 100644
--- a/perl-DBIx-Class.spec
+++ b/perl-DBIx-Class.spec
@@ -1,106 +1,106 @@
 Name:           perl-DBIx-Class
-Version:        0.08112
-Release:        1%{?dist}
 Summary:        Extensible and flexible object <-> relational mapper
+Version:        0.08120
+Release:        4%{?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::Trigger)
+BuildRequires:  perl(Class::ISA)
+BuildRequires:  perl(Context::Preserve) >= 0.01
+BuildRequires:  perl(CPAN)
+BuildRequires:  perl(Data::Dumper::Concise) >= 1.000
 BuildRequires:  perl(Data::Page) >= 2.00
 BuildRequires:  perl(DBD::SQLite) >= 1.25
-BuildRequires:  perl(DBI) >= 1.605
-BuildRequires:  perl(DBIx::ContextualFetch)
-BuildRequires:  perl(JSON::Any) >= 1.18
-BuildRequires:  perl(List::Util) >= 1.19
+BuildRequires:  perl(DBI) >= 1.609
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
+BuildRequires:  perl(File::Temp) >= 0.22
 BuildRequires:  perl(Module::Find) >= 0.06
+BuildRequires:  perl(MRO::Compat) >= 0.09
+BuildRequires:  perl(Path::Class) >= 0.18
 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(Sub::Name) >= 0.04
+BuildRequires:  perl(Test::Builder) >= 0.33
 BuildRequires:  perl(Test::Exception)
-# optional tests
-BuildRequires:  perl(DateTime::Format::MySQL)
-BuildRequires:  perl(Text::CSV_XS)
-BuildRequires:  perl(Test::Memory::Cycle)
-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(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::Moose)
 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
+BuildRequires:  perl(Text::CSV_XS)
 
-# 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
-
+Requires:       perl(Class::Inspector) >= 1.24
+Requires:       perl(Context::Preserve) >= 0.01
+Requires:       perl(Data::Dumper::Concise) >= 1.000
+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.61
+Requires:       perl(SQL::Abstract::Limit) >= 0.13
+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(Test::Pod) >= 1.41
+BuildRequires: perl(Test::Pod::Coverage) >= 1.08
+BuildRequires: perl(Text::CSV) >= 1.16
+BuildRequires: perl(Time::Piece::MySQL)
+BuildRequires: perl(namespace::autoclean) >= 0.09
+BuildRequires: perl(namespace::clean) >= 0.11
+
+%{?filter_from_requires: %filter_from_requires /^perl(DBD::Pg)$/d }
 %{?perl_default_filter:
-%filter_from_requires /^perl(DBD::Pg)/d
+%filter_from_requires /^perl(DBIx::Class::\(Admin\|CDBICompat\|ClassResolver\|Storage\)/d
+%filter_provides_in %{perl_vendorlib}/DBIx/Class/Admin
+%filter_requires_in %{perl_vendorlib}/DBIx/Class/Admin
+%filter_provides_in %{perl_vendorlib}/DBIx/Class/CDBICompat
+%filter_requires_in %{perl_vendorlib}/DBIx/Class/CDBICompat
+%filter_provides_in %{perl_vendorlib}/DBIx/Class/PK/Auto
+%filter_requires_in %{perl_vendorlib}/DBIx/Class/PK/Auto
+%filter_provides_in %{perl_vendorlib}/DBIx/Class/SQLAHacks
+%filter_requires_in %{perl_vendorlib}/DBIx/Class/SQLAHacks
+%filter_from_provides /^perl(DBIx::Class::SQLAHacks)/d
+%filter_from_requires /^perl(DBIx::Class::SQLAHacks)/d
+%filter_from_provides /^perl(DBIx::Class::Storage::DBIHacks)/d
+%filter_from_requires /^perl(DBIx::Class::Storage::DBIHacks)/d
 %perl_default_filter
 }
-
-### auto-added brs!
-BuildRequires:  perl(File::Temp) >= 0.22
+%{?perl_default_subpackage_tests}
 
 %description
 This is an SQL to OO mapper with an object API inspired by Class::DBI
@@ -132,7 +132,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 +152,73 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README examples/ t/
+%doc Changes README examples/
 %{perl_vendorlib}/*
 %{_bindir}/*
 %{_mandir}/man[13]/*
 
 
 %changelog
+* Fri Apr 30 2010 Marcela Maslanova <mmaslano@redhat.com> - 0.08120-4
+- Mass rebuild with perl-5.12.0
+
+* Fri Mar 19 2010 Chris Weyl <cweyl@alumni.drew.edu> 0.08120-3
+- quiet our repo/dep-checking scripts as we figure out how to handle no_index
+  from a "requires" perspective
+
+* Wed Mar 17 2010 Chris Weyl <cweyl@alumni.drew.edu> 0.08120-2
+- update F::A::MT so bits marked as "no_index" are filtered both for provides
+  _and_ requires
+- update by Fedora::App::MaintainerTools 0.006
+- additional deps script run; 27 deps found
+
+* Sat Mar 06 2010 Chris Weyl <cweyl@alumni.drew.edu> 0.08120-1
+- update by Fedora::App::MaintainerTools 0.004
+- updating to latest GA CPAN version (0.08120)
+- added a new br on perl(Context::Preserve) (version 0.01)
+- added manual BR on perl(Test::Moose)
+- added a new req on perl(Context::Preserve) (version 0.01)
+- dropped old requires on perl(List::Util)
+- dropped old requires on perl(Scalar::Util)
+- dropped old requires on perl(Storable)
+- additional deps script run; 27 deps found
+
+* Fri Mar  5 2010 Stepan Kasal <skasal@redhat.com> 0.08119-3
+- filter also requires for "hidden" package declarations
+
+* Thu Mar 04 2010 Chris Weyl <cweyl@alumni.drew.edu> 0.08119-2
+- add ok to BR (unlisted optional testing dep)
+
+* Tue Feb 23 2010 Chris Weyl <cweyl@alumni.drew.edu> 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 <cweyl@alumni.drew.edu> 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 <cweyl@alumni.drew.edu> 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 <cweyl@alumni.drew.edu> 0.08112-2
+- bump
+
 * Sun Sep 27 2009 Chris Weyl <cweyl@alumni.drew.edu> 0.08112-1
 - auto-update to 0.08112 (by cpan-spec-update 0.01)
 
diff --git a/sources b/sources
index 10c5683..fb97599 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bf4f4dd040c5f994606c33ee5fcdc9f6  DBIx-Class-0.08112.tar.gz
+ebed5ed315618e783ac048767aed90a5  DBIx-Class-0.08120.tar.gz