From 4bb3c0766b7ebc31056841dd3b3aa54a2c6e046f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Fri, 12 Feb 2016 15:11:38 +0100 Subject: [PATCH] 0.082821 bump --- .gitignore | 1 + ...ndency-tests-to-work-on-newer-libsql.patch | 96 ------------------- perl-DBIx-Class.spec | 12 ++- sources | 2 +- 4 files changed, 9 insertions(+), 102 deletions(-) delete mode 100644 DBIx-Class-0.082820-Adjust-view-dependency-tests-to-work-on-newer-libsql.patch diff --git a/.gitignore b/.gitignore index 897ca6f..269caaf 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ DBIx-Class-0.08120.tar.gz /DBIx-Class-0.08250.tar.gz /DBIx-Class-0.082810.tar.gz /DBIx-Class-0.082820.tar.gz +/DBIx-Class-0.082821.tar.gz diff --git a/DBIx-Class-0.082820-Adjust-view-dependency-tests-to-work-on-newer-libsql.patch b/DBIx-Class-0.082820-Adjust-view-dependency-tests-to-work-on-newer-libsql.patch deleted file mode 100644 index 9f3da30..0000000 --- a/DBIx-Class-0.082820-Adjust-view-dependency-tests-to-work-on-newer-libsql.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 5de3b12e4eecd4efb47e1896dc1d5432bc532568 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Tue, 3 Nov 2015 15:22:54 +0100 -Subject: [PATCH] Adjust view-dependency tests to work on newer libsqlite -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Port upstream fix for SQLite-3.9.0 to 0.082820: - -commit 26c663f123032941cb3f61d6cd11869b86716d6d -Author: Peter Rabbitson -Date: Tue Nov 3 14:35:35 2015 +0100 - - Adjust view-dependency tests to work on newer libsqlite - - The test and mechanism behind it is largely useless in these cases, but old - sqlite installations will lurk around for ever, so keep the check while moving - it to xt/ - -The original fix makes the tests author's tests, so they are not run -at all. Let's keep the test running by default until upstream releases -new version. - -CPAN RT#107852 - -Signed-off-by: Petr Písař ---- - t/105view_deps.t | 29 ++++++++++++++++------------- - 1 file changed, 16 insertions(+), 13 deletions(-) - -diff --git a/t/105view_deps.t b/t/105view_deps.t -index 21aa92b..39bb632 100644 ---- a/t/105view_deps.t -+++ b/t/105view_deps.t -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -+use DBIx::Class::Optional::Dependencies -skip_all_without => 'deploy'; - - use strict; - use warnings; -@@ -11,15 +11,6 @@ use DBICTest; - use ViewDeps; - use ViewDepsBad; - --BEGIN { -- require DBIx::Class; -- plan skip_all => 'Test needs ' . -- DBIx::Class::Optional::Dependencies->req_missing_for('deploy') -- unless DBIx::Class::Optional::Dependencies->req_ok_for('deploy'); --} -- --use_ok('DBIx::Class::ResultSource::View'); -- - #################### SANITY - - my $view = DBIx::Class::ResultSource::View->new; -@@ -73,10 +64,16 @@ can_ok( $view, $_ ) for qw/new from deploy_depends_on/; - = ViewDepsBad->connect( DBICTest->_database ( quote_char => '"') ); - ok( $schema2, 'Connected to ViewDepsBad schema OK' ); - -+ my $lazy_view_validity = !( -+ $schema2->storage->_server_info->{normalized_dbms_version} -+ < -+ 3.009 -+ ); -+ - #################### DEPLOY2 - - warnings_exist { $schema2->deploy } -- [qr/no such table: main.aba_name_artists/], -+ [ $lazy_view_validity ? () : qr/no such table: main.aba_name_artists/ ], - "Deploying the bad schema produces a warning: aba_name_artists was not created."; - - #################### DOES ORDERING WORK 2? -@@ -106,9 +103,15 @@ can_ok( $view, $_ ) for qw/new from deploy_depends_on/; - } grep { !/AbaNameArtistsAnd2010CDsWithManyTracks/ } - @{ [ $schema2->sources ] }; - -+ $schema2->storage->dbh->do(q( DROP VIEW "aba_name_artists" )) -+ if $lazy_view_validity; -+ - throws_ok { $schema2->resultset('AbaNameArtistsAnd2010CDsWithManyTracks')->next } -- qr/no such table: aba_name_artists_and_2010_cds_with_many_tracks/, -- "Query on AbaNameArtistsAnd2010CDsWithManyTracks throws, because the table does not exist" -+ qr/no such table: (?:main\.)?aba_name_artists/, -+ sprintf( -+ "Query on AbaNameArtistsAnd2010CDsWithManyTracks throws, because the%s view does not exist", -+ $lazy_view_validity ? ' underlying' : '' -+ ) - ; - } - --- -2.4.3 - diff --git a/perl-DBIx-Class.spec b/perl-DBIx-Class.spec index 3c6e045..4771867 100644 --- a/perl-DBIx-Class.spec +++ b/perl-DBIx-Class.spec @@ -1,15 +1,15 @@ Name: perl-DBIx-Class Summary: Extensible and flexible object <-> relational mapper -Version: 0.082820 -Release: 4%{?dist} +Version: 0.082821 +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 -# Restore compatability with SQLite-3.9.0, bug #1272905, CPAN RT#107852 -Patch0: DBIx-Class-0.082820-Adjust-view-dependency-tests-to-work-on-newer-libsql.patch URL: http://search.cpan.org/dist/DBIx-Class/ BuildArch: noarch # Build +BuildRequires: coreutils +BuildRequires: make BuildRequires: perl BuildRequires: perl(Config) BuildRequires: perl(CPAN) @@ -268,7 +268,6 @@ DISTINCT, GROUP BY and HAVING support. %prep %setup -q -n DBIx-Class-%{version} -%patch0 -p1 chmod -c +x script/* # skip dbic_pretty.t when bootstrapping %if 0%{?perl_bootstrap} @@ -299,6 +298,9 @@ make test %{_mandir}/man[13]/* %changelog +* Fri Feb 12 2016 Petr Šabata - 0.082821-1 +- 0.082821 bump + * Thu Feb 04 2016 Fedora Release Engineering - 0.082820-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 9c5f9cc..1ad9eb0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f2e67a7e46509f5224f14082068322e7 DBIx-Class-0.082820.tar.gz +afe585b9aed5fb4715cb50ee345ff384 DBIx-Class-0.082821.tar.gz