From 6644c83e40cd59080f4c96ea0bd1cb95a3ea2ce9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:30:44 +0000 Subject: [PATCH 01/12] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c628eb3..0a556b2 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := perl-DBIx-Class SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From fe986b7115084c9c15e9569dcec2267857507773 Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Wed, 20 Jan 2010 06:15:28 +0000 Subject: [PATCH 02/12] - bump --- perl-DBIx-Class.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-DBIx-Class.spec b/perl-DBIx-Class.spec index ad1ea79..2ec7327 100644 --- a/perl-DBIx-Class.spec +++ b/perl-DBIx-Class.spec @@ -1,6 +1,6 @@ Name: perl-DBIx-Class Version: 0.08112 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Extensible and flexible object <-> relational mapper License: GPL+ or Artistic Group: Development/Libraries @@ -159,6 +159,9 @@ rm -rf %{buildroot} %changelog +* Tue Jan 19 2010 Chris Weyl 0.08112-2 +- bump + * Sun Sep 27 2009 Chris Weyl 0.08112-1 - auto-update to 0.08112 (by cpan-spec-update 0.01) From 0f3ef701f06a739d8ff75774ae31b7a4668d1374 Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Thu, 4 Mar 2010 08:01:45 +0000 Subject: [PATCH 03/12] - 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 --- .cvsignore | 2 +- auto.ini | 31 ++++++++ find_optional_deps | 42 ++++++++++ perl-DBIx-Class.spec | 184 +++++++++++++++++++++++++------------------ sources | 2 +- 5 files changed, 183 insertions(+), 78 deletions(-) create mode 100644 auto.ini create mode 100755 find_optional_deps 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 From 6d7b65dd208fddd5ef40481ec28d94ede157ef09 Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Thu, 4 Mar 2010 08:14:06 +0000 Subject: [PATCH 04/12] - add ok to BR (unlisted optional testing dep) --- auto.ini | 2 ++ perl-DBIx-Class.spec | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/auto.ini b/auto.ini index 3632078..5855e22 100644 --- a/auto.ini +++ b/auto.ini @@ -25,6 +25,8 @@ perl(Moose::Util::TypeConstraints)=0.54 perl(Class::Data::Inheritable)=0 perl(Class::Inspector)=1.24 perl(Class::Trigger)=0 +; +perl(Test::Moose)=0 [metadata_filtering] ; this wouldn't be an issue if we'd filter dupes in perl_default_filter diff --git a/perl-DBIx-Class.spec b/perl-DBIx-Class.spec index 610637a..02be5e8 100644 --- a/perl-DBIx-Class.spec +++ b/perl-DBIx-Class.spec @@ -1,7 +1,7 @@ Name: perl-DBIx-Class Summary: Extensible and flexible object <-> relational mapper Version: 0.08119 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL+ or Artistic Group: Development/Libraries Source0: http://search.cpan.org/CPAN/authors/id/R/RI/RIBASUSHI/DBIx-Class-%{version}.tar.gz @@ -97,6 +97,7 @@ 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 +BuildRequires: perl(ok) # optional deps for group: replicated BuildRequires: perl(Hash::Merge) >= 0.11 BuildRequires: perl(Moose) >= 0.98 @@ -164,6 +165,9 @@ rm -rf %{buildroot} %changelog +* Thu Mar 04 2010 Chris Weyl 0.08119-2 +- add ok to BR (unlisted optional testing dep) + * Tue Feb 23 2010 Chris Weyl 0.08119-1 - update by Fedora::App::MaintainerTools 0.003 - PERL_INSTALL_ROOT => DESTDIR From e3f41da47b3dbb2d600a58429669c4cab6094657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= Date: Fri, 5 Mar 2010 18:04:28 +0000 Subject: [PATCH 05/12] - filter also requires for "hidden" package declarations --- perl-DBIx-Class.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/perl-DBIx-Class.spec b/perl-DBIx-Class.spec index 02be5e8..c323d35 100644 --- a/perl-DBIx-Class.spec +++ b/perl-DBIx-Class.spec @@ -1,7 +1,7 @@ Name: perl-DBIx-Class Summary: Extensible and flexible object <-> relational mapper Version: 0.08119 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL+ or Artistic Group: Development/Libraries Source0: http://search.cpan.org/CPAN/authors/id/R/RI/RIBASUSHI/DBIx-Class-%{version}.tar.gz @@ -104,8 +104,14 @@ 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} +# the package intentionally hides some package declarations +# from automatic parser; avoid requiring any of these: + +%{?perl_default_filter: +%filter_from_requires /^perl(DBIx::Class::\(Admin\|CDBICompat\|ClassResolver\|Storage\)/d +%filter_from_requires /^perl(DBD::Pg)/d +%perl_default_filter +} %{?perl_default_subpackage_tests} %description @@ -165,6 +171,9 @@ rm -rf %{buildroot} %changelog +* Fri Mar 5 2010 Stepan Kasal 0.08119-3 +- filter also requires for "hidden" package declarations + * Thu Mar 04 2010 Chris Weyl 0.08119-2 - add ok to BR (unlisted optional testing dep) From 05af714bba3cb127342a8b2ecb79b3f164358d6f Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Wed, 17 Mar 2010 01:09:33 +0000 Subject: [PATCH 06/12] - 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 --- find_optional_deps | 14 +++++---- perl-DBIx-Class.spec | 71 +++++++++++++++++++++++++------------------- sources | 2 +- 3 files changed, 49 insertions(+), 38 deletions(-) diff --git a/find_optional_deps b/find_optional_deps index 74e31f6..b4c1ec3 100755 --- a/find_optional_deps +++ b/find_optional_deps @@ -15,13 +15,15 @@ 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() }; -# +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; +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 }; diff --git a/perl-DBIx-Class.spec b/perl-DBIx-Class.spec index c323d35..ce5d0a2 100644 --- a/perl-DBIx-Class.spec +++ b/perl-DBIx-Class.spec @@ -1,7 +1,7 @@ Name: perl-DBIx-Class Summary: Extensible and flexible object <-> relational mapper -Version: 0.08119 -Release: 3%{?dist} +Version: 0.08120 +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 @@ -19,6 +19,7 @@ BuildRequires: perl(Class::Inspector) >= 1.24 BuildRequires: perl(Class::MOP) >= 0.63 BuildRequires: perl(Class::Trigger) BuildRequires: perl(Clone) +BuildRequires: perl(Context::Preserve) >= 0.01 BuildRequires: perl(CPAN) BuildRequires: perl(Data::Dumper::Concise) >= 1.000 BuildRequires: perl(Data::Page) >= 2.00 @@ -30,24 +31,21 @@ BuildRequires: perl(DBI) >= 1.609 BuildRequires: perl(DBIx::ContextualFetch) 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) >= 0.98 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.61 BuildRequires: perl(SQL::Abstract::Limit) >= 0.13 -BuildRequires: perl(SQL::Translator) -BuildRequires: perl(Storable) +BuildRequires: perl(SQL::Translator) >= 0.11002 BuildRequires: perl(Sub::Name) >= 0.04 BuildRequires: perl(Test::Builder) >= 0.33 -BuildRequires: perl(Test::Deep) BuildRequires: perl(Test::Exception) BuildRequires: perl(Test::Memory::Cycle) +BuildRequires: perl(Test::Moose) BuildRequires: perl(Test::More) >= 0.92 BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) @@ -60,56 +58,56 @@ Requires: perl(Carp::Clan) >= 6.0 Requires: perl(Class::Accessor::Grouped) >= 0.09002 Requires: perl(Class::C3::Componentised) >= 1.0005 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(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 +# 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(Time::Piece::MySQL) -# optional deps for group: deploy -BuildRequires: perl(SQL::Translator) >= 0.11002 -# optional deps for group: admin +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(ok) -# 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 -# the package intentionally hides some package declarations -# from automatic parser; avoid requiring any of these: - +%{?filter_from_requires: %filter_from_requires /^perl(DBD::Pg)$/d } %{?perl_default_filter: -%filter_from_requires /^perl(DBIx::Class::\(Admin\|CDBICompat\|ClassResolver\|Storage\)/d -%filter_from_requires /^perl(DBD::Pg)/d +%filter_provides_in %{perl_vendorlib}/DBIx/Class/Admin +%filter_provides_in %{perl_vendorlib}/DBIx/Class/CDBICompat +%filter_provides_in %{perl_vendorlib}/DBIx/Class/PK/Auto +%filter_provides_in %{perl_vendorlib}/DBIx/Class/SQLAHacks +%filter_from_provides /^perl(DBIx::Class::SQLAHacks)/d +%filter_from_provides /^perl(DBIx::Class::Storage::DBIHacks)/d %perl_default_filter } %{?perl_default_subpackage_tests} @@ -171,6 +169,17 @@ rm -rf %{buildroot} %changelog +* Sat Mar 06 2010 Chris Weyl 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 0.08119-3 - filter also requires for "hidden" package declarations diff --git a/sources b/sources index 39c2feb..fb97599 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8159c0841f9d21fbec368d038c1fdf65 DBIx-Class-0.08119.tar.gz +ebed5ed315618e783ac048767aed90a5 DBIx-Class-0.08120.tar.gz From 0299345a188af47aab557574a704359e5c6a2ec3 Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Wed, 17 Mar 2010 16:32:28 +0000 Subject: [PATCH 07/12] - 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 --- perl-DBIx-Class.spec | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/perl-DBIx-Class.spec b/perl-DBIx-Class.spec index ce5d0a2..8d4d37d 100644 --- a/perl-DBIx-Class.spec +++ b/perl-DBIx-Class.spec @@ -1,7 +1,7 @@ Name: perl-DBIx-Class Summary: Extensible and flexible object <-> relational mapper Version: 0.08120 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL+ or Artistic Group: Development/Libraries Source0: http://search.cpan.org/CPAN/authors/id/R/RI/RIBASUSHI/DBIx-Class-%{version}.tar.gz @@ -14,45 +14,28 @@ BuildRequires: perl >= 1:5.6.1 BuildRequires: perl(Carp::Clan) >= 6.0 BuildRequires: perl(Class::Accessor::Grouped) >= 0.09002 BuildRequires: perl(Class::C3::Componentised) >= 1.0005 -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(Context::Preserve) >= 0.01 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.609 -BuildRequires: perl(DBIx::ContextualFetch) BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42 BuildRequires: perl(File::Temp) >= 0.22 BuildRequires: perl(Module::Find) >= 0.06 -BuildRequires: perl(Moose) >= 0.98 -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(Scope::Guard) >= 0.03 BuildRequires: perl(SQL::Abstract) >= 1.61 BuildRequires: perl(SQL::Abstract::Limit) >= 0.13 -BuildRequires: perl(SQL::Translator) >= 0.11002 BuildRequires: perl(Sub::Name) >= 0.04 BuildRequires: perl(Test::Builder) >= 0.33 BuildRequires: perl(Test::Exception) -BuildRequires: perl(Test::Memory::Cycle) BuildRequires: perl(Test::Moose) BuildRequires: perl(Test::More) >= 0.92 -BuildRequires: perl(Test::Pod) -BuildRequires: perl(Test::Pod::Coverage) BuildRequires: perl(Test::Warn) >= 0.21 BuildRequires: perl(Text::CSV_XS) -BuildRequires: perl(Time::Piece) -BuildRequires: perl(Time::Piece::MySQL) Requires: perl(Carp::Clan) >= 6.0 Requires: perl(Class::Accessor::Grouped) >= 0.09002 @@ -103,11 +86,17 @@ BuildRequires: perl(namespace::clean) >= 0.11 %{?filter_from_requires: %filter_from_requires /^perl(DBD::Pg)$/d } %{?perl_default_filter: %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 } %{?perl_default_subpackage_tests} @@ -169,6 +158,12 @@ rm -rf %{buildroot} %changelog +* Wed Mar 17 2010 Chris Weyl 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 0.08120-1 - update by Fedora::App::MaintainerTools 0.004 - updating to latest GA CPAN version (0.08120) From dd728d6dc0f3f5a010ec8c048f9785d413294991 Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Wed, 17 Mar 2010 16:34:21 +0000 Subject: [PATCH 08/12] - 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 --- auto.ini | 26 ++------------------------ perl-DBIx-Class.spec | 4 ++-- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/auto.ini b/auto.ini index 5855e22..4e71e7e 100644 --- a/auto.ini +++ b/auto.ini @@ -1,33 +1,11 @@ [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 ; perl(Test::Moose)=0 [metadata_filtering] -; this wouldn't be an issue if we'd filter dupes in perl_default_filter +; 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 diff --git a/perl-DBIx-Class.spec b/perl-DBIx-Class.spec index 8d4d37d..ef31db9 100644 --- a/perl-DBIx-Class.spec +++ b/perl-DBIx-Class.spec @@ -94,9 +94,9 @@ BuildRequires: perl(namespace::clean) >= 0.11 %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_requires /^perl(DBIx::Class::SQLAHacks)/d %filter_from_provides /^perl(DBIx::Class::Storage::DBIHacks)/d -%filter_From_requires /^perl(DBIx::Class::Storage::DBIHacks)/d +%filter_from_requires /^perl(DBIx::Class::Storage::DBIHacks)/d %perl_default_filter } %{?perl_default_subpackage_tests} From 6129b83dd486364ba8a25534b6d5075cb0725d64 Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Fri, 19 Mar 2010 15:58:32 +0000 Subject: [PATCH 09/12] - quiet our repo/dep-checking scripts as we figure out how to handle no_index from a "requires" perspective --- auto.ini | 1 + perl-DBIx-Class.spec | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/auto.ini b/auto.ini index 4e71e7e..3c8330c 100644 --- a/auto.ini +++ b/auto.ini @@ -9,3 +9,4 @@ perl(Test::Moose)=0 ; 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/perl-DBIx-Class.spec b/perl-DBIx-Class.spec index ef31db9..b684b78 100644 --- a/perl-DBIx-Class.spec +++ b/perl-DBIx-Class.spec @@ -1,7 +1,7 @@ Name: perl-DBIx-Class Summary: Extensible and flexible object <-> relational mapper Version: 0.08120 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL+ or Artistic Group: Development/Libraries Source0: http://search.cpan.org/CPAN/authors/id/R/RI/RIBASUSHI/DBIx-Class-%{version}.tar.gz @@ -85,6 +85,7 @@ BuildRequires: perl(namespace::clean) >= 0.11 %{?filter_from_requires: %filter_from_requires /^perl(DBD::Pg)$/d } %{?perl_default_filter: +%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 @@ -158,6 +159,10 @@ rm -rf %{buildroot} %changelog +* Fri Mar 19 2010 Chris Weyl 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 0.08120-2 - update F::A::MT so bits marked as "no_index" are filtered both for provides _and_ requires From 8812e6e3e149c20c1c5e23c753e03f4f60369ae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Fri, 30 Apr 2010 14:14:16 +0000 Subject: [PATCH 10/12] - Mass rebuild with perl-5.12.0 --- perl-DBIx-Class.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-DBIx-Class.spec b/perl-DBIx-Class.spec index b684b78..c91bfe5 100644 --- a/perl-DBIx-Class.spec +++ b/perl-DBIx-Class.spec @@ -1,7 +1,7 @@ Name: perl-DBIx-Class Summary: Extensible and flexible object <-> relational mapper Version: 0.08120 -Release: 3%{?dist} +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 @@ -159,6 +159,9 @@ rm -rf %{buildroot} %changelog +* Fri Apr 30 2010 Marcela Maslanova - 0.08120-4 +- Mass rebuild with perl-5.12.0 + * Fri Mar 19 2010 Chris Weyl 0.08120-3 - quiet our repo/dep-checking scripts as we figure out how to handle no_index from a "requires" perspective From f1ee09ee1888176d803441c30cf137e7f3c504eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Fri, 7 May 2010 09:20:19 +0000 Subject: [PATCH 11/12] - Mass rebuild with perl-5.12.0 --- perl-DBIx-Class.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-DBIx-Class.spec b/perl-DBIx-Class.spec index c91bfe5..c27b7d7 100644 --- a/perl-DBIx-Class.spec +++ b/perl-DBIx-Class.spec @@ -10,11 +10,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1 BuildRequires: perl(Carp::Clan) >= 6.0 BuildRequires: perl(Class::Accessor::Grouped) >= 0.09002 BuildRequires: perl(Class::C3::Componentised) >= 1.0005 BuildRequires: perl(Class::Inspector) >= 1.24 +BuildRequires: perl(Class::ISA) BuildRequires: perl(Context::Preserve) >= 0.01 BuildRequires: perl(CPAN) BuildRequires: perl(Data::Dumper::Concise) >= 1.000 From 1a54c02b91a871d59b584fe7af0f7513eaa69fab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 06:21:11 +0000 Subject: [PATCH 12/12] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 0a556b2..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: perl-DBIx-Class -# $Id$ -NAME := perl-DBIx-Class -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON)