[packages/perl-DBIx-Class] - updated to 0.08250 - fixed formating of test sql statement - updated BRs

baggins baggins at pld-linux.org
Sun Jan 26 01:14:25 CET 2014


commit f2ac0ba4ff4412bb1b678aa5140f042bc556ac78
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Jan 26 01:13:54 2014 +0100

    - updated to 0.08250
    - fixed formating of test sql statement
    - updated BRs

 perl-DBIx-Class.spec | 29 ++++++++++++++++++-----------
 test.patch           | 25 +++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 11 deletions(-)
---
diff --git a/perl-DBIx-Class.spec b/perl-DBIx-Class.spec
index fec306d..7bff80d 100644
--- a/perl-DBIx-Class.spec
+++ b/perl-DBIx-Class.spec
@@ -8,35 +8,40 @@
 Summary:	DBIx::Class - Extensible and flexible object <-> relational mapper
 Summary(pl.UTF-8):	DBIx::Class - rozszerzalne i elastyczne wiązanie obiektów <-> relacji
 Name:		perl-DBIx-Class
-Version:	0.08196
+Version:	0.08250
 Release:	1
 License:	GPL v1+ or Artistic
 Group:		Development/Languages/Perl
 Source0:	http://www.cpan.org/modules/by-module/DBIx/%{pdir}-%{pnam}-%{version}.tar.gz
-# Source0-md5:	9170d4fe95665189ed020c39d7370ca2
+# Source0-md5:	4f65022a3d9480f3bb0610580dfdaf56
+Patch0:		test.patch
 URL:		http://search.cpan.org/dist/DBIx-Class/
 BuildRequires:	perl-devel >= 1:5.8.0
 BuildRequires:	rpm-perlprov >= 4.1-13
 %if %{with tests}
 BuildRequires:	perl-Carp-Clan >= 6.0
-BuildRequires:	perl-Class-Accessor-Grouped >= 0.10002
+BuildRequires:	perl-Class-Accessor-Grouped >= 0.10010
 BuildRequires:	perl-Class-C3-Componentised >= 1.0009
 BuildRequires:	perl-Class-Inspector >= 1.24
+BuildRequires:	perl-Context-Preserve
+BuildRequires:	perl-Config-Any >= 0.20
 BuildRequires:	perl-DBD-SQLite >= 1.29
 BuildRequires:	perl-DBI >= 1.605
-BuildRequires:	perl-Data-Dumper-Concise
+BuildRequires:	perl-Data-Compare >= 1.22
+BuildRequires:	perl-Data-Dumper-Concise >= 2.020
 BuildRequires:	perl-Data-Page >= 2.00
 BuildRequires:	perl-Devel-Cycle >= 1.10
+BuildRequires:	perl-Devel-GlobalDestruction
 BuildRequires:	perl-ExtUtils-MakeMaker >= 6.42
 BuildRequires:	perl-File-Temp >= 0.22
 BuildRequires:	perl-JSON-Any >= 1.18
 BuildRequires:	perl-MRO-Compat >= 0.09
 BuildRequires:	perl-Module-Find >= 0.06
+BuildRequires:	perl-Moo >= 1.004002
 BuildRequires:	perl-Path-Class >= 0.16
-BuildRequires:	perl-SQL-Abstract >= 1.72
+BuildRequires:	perl-SQL-Abstract >= 1.73
 BuildRequires:	perl-SQL-Abstract-Limit >= 0.13
-# optional. not accessible atm
-#BuildRequires:	perl-SQL-Translator >= 0.11006
+BuildRequires:	perl-SQL-Translator >= 0.11006
 BuildRequires:	perl-Scope-Guard >= 0.03
 BuildRequires:	perl-Sub-Name >= 0.04
 BuildRequires:	perl-Test-Deep
@@ -45,6 +50,7 @@ BuildRequires:	perl-Test-Memory-Cycle
 BuildRequires:	perl-Test-Simple >= 0.92
 BuildRequires:	perl-Test-Warn >= 0.21
 BuildRequires:	perl-Text-CSV
+BuildRequires:	perl-namespace-clean
 %endif
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -52,7 +58,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # Only APR::UUID is available in PLD. And if it was we would still
 # need only one of Data::UUID, Data::Uniqid, APR::UUID or UUID at any
 # time to get full functionality
-%define 	_noautoreq	'perl(Data::Uniqid)' 'perl(UUID)' 'perl(APR::UUID)' 'perl(JSON)' 'perl(DBD::Multi)' 'perl(DBIC::SQL::Abstract)'
+%define		_noautoreq_perl	Data::Uniqid UUID APR::UUID JSON DBD::Multi DBIC::SQL::Abstract
 
 %description
 DBIx::Class is a SQL to OOP mapper, inspired by the Class::DBI
@@ -92,12 +98,13 @@ DBIx::Class::Schema oraz generator plików DBIx::Class.
 
 %prep
 %setup -q -n %{pdir}-%{pnam}-%{version}
+%patch0 -p1
 
-# SQL::Translator is FUBAR
-mv t/94versioning.t{,.fubar}
+# requires installed DBIx::Class of same version
+%{__mv} t/storage/dbic_pretty.t{,.disabled}
 
 %build
-%{__perl} -MExtUtils::MakeMaker -e 'WriteMakefile(NAME=>"DBIx::Class", EXE_FILES=>[<script/*>])' \
+%{__perl} Makefile.PL \
 	INSTALLDIRS=vendor
 %{__make}
 
diff --git a/test.patch b/test.patch
new file mode 100644
index 0000000..f63b9b3
--- /dev/null
+++ b/test.patch
@@ -0,0 +1,25 @@
+--- DBIx-Class-0.08250/t/resultset/update_delete.t.orig	2014-01-26 00:39:29.736905070 +0100
++++ DBIx-Class-0.08250/t/resultset/update_delete.t	2014-01-26 00:42:10.140237242 +0100
+@@ -122,21 +122,7 @@
+ is_same_sql_bind (
+   $sql,
+   \@bind,
+-  'UPDATE fourkeys
+-    SET read_count = read_count + 1
+-    WHERE (
+-      (foo, bar, hello, goodbye) IN (
+-        SELECT me.foo, me.bar, me.hello, me.goodbye
+-          FROM fourkeys me
+-          LEFT JOIN fourkeys_to_twokeys fourkeys_to_twokeys ON
+-                fourkeys_to_twokeys.f_bar = me.bar
+-            AND fourkeys_to_twokeys.f_foo = me.foo
+-            AND fourkeys_to_twokeys.f_goodbye = me.goodbye
+-            AND fourkeys_to_twokeys.f_hello = me.hello
+-        WHERE fourkeys_to_twokeys.pilot_sequence != ? AND ( bar = ? OR bar = ? ) AND ( foo = ? OR foo = ? ) AND ( goodbye = ? OR goodbye = ? ) AND ( hello = ? OR hello = ? ) AND sensors != ?
+-      )
+-    )
+-  ',
++  'UPDATE fourkeys SET read_count = read_count + 1 WHERE ( ( foo, bar, hello, goodbye ) IN ( (SELECT me.foo, me.bar, me.hello, me.goodbye FROM fourkeys me LEFT JOIN fourkeys_to_twokeys fourkeys_to_twokeys ON fourkeys_to_twokeys.f_bar = me.bar AND fourkeys_to_twokeys.f_foo = me.foo AND fourkeys_to_twokeys.f_goodbye = me.goodbye AND fourkeys_to_twokeys.f_hello = me.hello WHERE ( ( fourkeys_to_twokeys.pilot_sequence != ? AND ( ( bar = ? OR bar = ? ) AND ( foo = ? OR foo = ? ) AND ( goodbye = ? OR goodbye = ? ) AND ( hello = ? OR hello = ? ) AND sensors != ? ) ) )) ) )',
+   [
+     "'666'",
+     ("'1'", "'2'") x 4,
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/perl-DBIx-Class.git/commitdiff/f2ac0ba4ff4412bb1b678aa5140f042bc556ac78



More information about the pld-cvs-commit mailing list