commit a6b57b5c4259356e46978de144d02a4123e6148f
Merge: 34bf76d 094ce4f
Author: Iain Arnell <iarnell@xxxxxxxxx>
Date: Thu Sep 9 19:41:13 2010 +0200
Merge remote branch 'origin/master' into el6
- and disable Module::AutoInstall as we don't have new enough Test::More
Conflicts:
.gitignore
.gitignore | 2 +-
perl-DBIx-Class-Schema-Loader.spec | 163 +++++++++++++++++++++++------------
sources | 2 +-
3 files changed, 109 insertions(+), 58 deletions(-)
---
diff --cc perl-DBIx-Class-Schema-Loader.spec
index 6ab2871,c934ea7..8a9ab9f
--- a/perl-DBIx-Class-Schema-Loader.spec
+++ b/perl-DBIx-Class-Schema-Loader.spec
@@@ -1,47 -1,61 +1,61 @@@
Name: perl-DBIx-Class-Schema-Loader
- Version: 0.04006
- Release: 5%{?dist}
Summary: Dynamic definition of a DBIx::Class::Schema
+ Version: 0.05003
-Release: 2%{?dist}
++Release: 2%{?dist}.1
License: GPL+ or Artistic
Group: Development/Libraries
+ Source0: http://search.cpan.org/CPAN/authors/id/R/RK/RKITOVER/DBIx-Class-Schema-Loader-%{version}.tar.gz
URL: http://search.cpan.org/dist/DBIx-Class-Schema-Loader/
- Source0: http://search.cpan.org/CPAN/authors/id/I/IL/ILMARI/DBIx-Class-Schema-Loader-%{version}.tar.gz
-
- # Broken Module-Install, replace with Module-Install-0.91
- Patch0: DBIx-Class-Schema-Loader-0.04006.diff
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(Digest::MD5) >= 2.36
- BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
- BuildRequires: perl(File::Path)
- BuildRequires: perl(File::Spec)
- BuildRequires: perl(Scalar::Util)
- BuildRequires: perl(Test::More) >= 0.47
- BuildRequires: perl(Text::Balanced)
- BuildRequires: perl(YAML::Tiny), perl(File::Remove)
-
- # cpan
BuildRequires: perl(Carp::Clan)
- BuildRequires: perl(Class::Accessor::Fast) >= 0.30
- BuildRequires: perl(Class::C3) >= 0.18
- BuildRequires: perl(Class::Data::Accessor) >= 0.03
+ BuildRequires: perl(Class::Accessor::Grouped) >= 0.09002
+ BuildRequires: perl(Class::C3) >= 0.18
+ BuildRequires: perl(Class::C3::Componentised) >= 1.0005
BuildRequires: perl(Class::Inspector)
- BuildRequires: perl(Data::Dump) >= 1.06
- BuildRequires: perl(DBD::SQLite) >= 1.12
- BuildRequires: perl(DBI) >= 1.56
- BuildRequires: perl(DBIx::Class) >= 0.07006
+ BuildRequires: perl(Class::Unload)
+ BuildRequires: perl(CPAN)
+ BuildRequires: perl(Data::Dump) >= 1.06
+ BuildRequires: perl(DBD::SQLite) >= 1.12
+ BuildRequires: perl(DBI) >= 1.56
+ BuildRequires: perl(DBIx::Class) >= 0.08114
+ BuildRequires: perl(Digest::MD5) >= 2.36
+ BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
+ BuildRequires: perl(File::Copy)
+ BuildRequires: perl(File::Path) >= 2.07
+ BuildRequires: perl(File::Slurp) >= 9999.13
+ BuildRequires: perl(File::Spec)
+ BuildRequires: perl(File::Temp) >= 0.16
+ BuildRequires: perl(IPC::Open3)
BuildRequires: perl(Lingua::EN::Inflect::Number) >= 1.1
- BuildRequires: perl(UNIVERSAL::require) >= 0.11
- # optional tests
- BuildRequires: perl(Test::Pod)
- BuildRequires: perl(Test::Pod::Coverage)
-
- # not automatically picked up
- Requires: perl(Class::Accessor::Fast) >= 0.30
- Requires: perl(Class::Data::Accessor) >= 0.03
+ BuildRequires: perl(List::MoreUtils)
+ BuildRequires: perl(namespace::autoclean)
+ BuildRequires: perl(Scalar::Util)
+ BuildRequires: perl(Test::Exception)
+ BuildRequires: perl(Test::More) >= 0.92
+ BuildRequires: perl(Text::Balanced)
+
+ Requires: perl(Carp::Clan)
+ Requires: perl(Class::Accessor::Grouped) >= 0.09002
+ Requires: perl(Class::C3) >= 0.18
+ Requires: perl(Class::C3::Componentised) >= 1.0005
+ Requires: perl(Class::Inspector)
+ Requires: perl(Class::Unload)
+ Requires: perl(Data::Dump) >= 1.06
+ Requires: perl(DBIx::Class) >= 0.08114
+ Requires: perl(Digest::MD5) >= 2.36
+ Requires: perl(File::Slurp) >= 9999.13
+ Requires: perl(File::Spec)
+ Requires: perl(Lingua::EN::Inflect::Number) >= 1.1
+ Requires: perl(List::MoreUtils)
+ Requires: perl(namespace::autoclean)
+ Requires: perl(Scalar::Util)
+ Requires: perl(Text::Balanced)
+
+ %{?perl_default_filter}
+ %{?perl_default_subpackage_tests}
%description
DBIx::Class::Schema::Loader automates the definition of a
@@@ -50,28 -64,9 +64,11 @@@ and setting up the columns, primary key
%prep
%setup -q -n DBIx-Class-Schema-Loader-%{version}
- %patch0 -p1
- # make sure doc/tests don't generate provides
- # note we first filter out the bits in _docdir...
- cat << \EOF > %{name}-prov
- #!/bin/sh
- %{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'`
- EOF
-
- %define __perl_provides %{_builddir}/DBIx-Class-Schema-Loader-%{version}/%{name}-prov
- chmod +x %{__perl_provides}
-
- cat << \EOF > %{name}-req
- #!/bin/sh
- %{__perl_requires} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'`
- EOF
-
- %define __perl_requires %{_builddir}/DBIx-Class-Schema-Loader-%{version}/%{name}-req
- chmod +x %{__perl_requires}
++sed -i -e '/auto_install/d' Makefile.PL
+
%build
- %{__perl} Makefile.PL INSTALLDIRS=vendor --skipdeps
+ %{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}
%install
@@@ -92,11 -88,63 +90,64 @@@ rm -rf %{buildroot
%files
%defattr(-,root,root,-)
- %doc Changes README t/
- %{perl_vendorlib}/DBIx/Class/*
- %{_mandir}/man3/*
+ %doc Changes README
+ %{perl_vendorlib}/*
+ %{_mandir}/man[13]/*
+ %{_bindir}/*
%changelog
-* Fri Apr 30 2010 Marcela Maslanova <mmaslano@xxxxxxxxxx> - 0.05003-2
-- Mass rebuild with perl-5.12.0
++* Thu Sep 09 2010 Iain Arnell <iarnell@xxxxxxxxx> 0.05003-2.1
++- update to latest from rawhide
++- disable Module::AutoInstall as we don't have new enough Test::More
+
+ * Tue Feb 23 2010 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> 0.05003-1
+ - switch filtering systems
+ - add files in bin && man1
+ - enable back-compat testing
+ - update by Fedora::App::MaintainerTools 0.003
+ - PERL_INSTALL_ROOT => DESTDIR
+ - added a new br on perl(Class::Accessor::Grouped) (version 0.09002)
+ - added a new br on perl(Class::C3::Componentised) (version 1.0005)
+ - added a new br on perl(Class::Unload) (version 0)
+ - altered br on perl(DBIx::Class) (0.07006 => 0.08114)
+ - added a new br on perl(File::Copy) (version 0)
+ - altered br on perl(File::Path) (0 => 2.07)
+ - added a new br on perl(File::Slurp) (version 9999.13)
+ - added a new br on perl(File::Temp) (version 0.16)
+ - added a new br on perl(IPC::Open3) (version 0)
+ - added a new br on perl(List::MoreUtils) (version 0)
+ - added a new br on perl(Test::Exception) (version 0)
+ - altered br on perl(Test::More) (0.47 => 0.92)
+ - added a new br on perl(namespace::autoclean) (version 0)
+ - dropped old BR on perl(Class::Accessor::Fast)
+ - dropped old BR on perl(Class::Data::Accessor)
+ - dropped old BR on perl(Test::Pod)
+ - dropped old BR on perl(Test::Pod::Coverage)
+ - dropped old BR on perl(UNIVERSAL::require)
+ - dropped old BR on perl(YAML::Tiny)
+ - added a new br on CPAN (inc::Module::AutoInstall found)
+ - added a new req on perl(Carp::Clan) (version 0)
+ - added a new req on perl(Class::Accessor::Grouped) (version 0.09002)
+ - added a new req on perl(Class::C3) (version 0.18)
+ - added a new req on perl(Class::C3::Componentised) (version 1.0005)
+ - added a new req on perl(Class::Inspector) (version 0)
+ - added a new req on perl(Class::Unload) (version 0)
+ - added a new req on perl(DBIx::Class) (version 0.08114)
+ - added a new req on perl(Data::Dump) (version 1.06)
+ - added a new req on perl(Digest::MD5) (version 2.36)
+ - added a new req on perl(File::Slurp) (version 9999.13)
+ - added a new req on perl(File::Spec) (version 0)
+ - added a new req on perl(Lingua::EN::Inflect::Number) (version 1.1)
+ - added a new req on perl(List::MoreUtils) (version 0)
+ - added a new req on perl(Scalar::Util) (version 0)
+ - added a new req on perl(Text::Balanced) (version 0)
+ - added a new req on perl(namespace::autoclean) (version 0)
+ - dropped old requires on perl(Class::Accessor::Fast)
+ - dropped old requires on perl(Class::Data::Accessor)
+
+ * Mon Dec 7 2009 Stepan Kasal <skasal@xxxxxxxxxx> - 0.04006-6
+ - rebuild against perl 5.10.1
+
* Wed Aug 05 2009 Ralf Corsépius <corsepiu@xxxxxxxxxxxxxxxxx> - 0.04006-5
- Remove R: DBIX::Class.
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
