1.33 bump, general cleanup
This commit is contained in:
Petr Sabata
parent
92b2ebff5a
commit
5f8c099d05
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
||||
DBD-SQLite-1.29.tar.gz
|
||||
/DBD-SQLite-1.31.tar.gz
|
||||
/DBD-SQLite-1.33.tar.gz
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
From 89c8a661e61bbf0fb1d1e5050262390649e13f2a Mon Sep 17 00:00:00 2001
|
||||
From: Niko Tyni <ntyni@debian.org>
|
||||
Date: Mon, 23 Aug 2010 08:15:15 +0300
|
||||
Subject: [PATCH] Don't clean temporary files in child processes
|
||||
|
||||
As of SQLite 3.7.0, write locks try to stat() the database
|
||||
file and fail with a 'Disk I/O error' if it is missing. This
|
||||
breaks those tests that fork child processes (namely 08_busy.t
|
||||
and t/28_schemachange.t) because the child process removes
|
||||
the database file in the END block.
|
||||
|
||||
The fix is to disable the clean() function for child processes.
|
||||
|
||||
See <http://bugs.debian.org/591111>
|
||||
---
|
||||
t/lib/Test.pm | 3 +++
|
||||
1 files changed, 3 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/t/lib/Test.pm b/t/lib/Test.pm
|
||||
index 80e50ce..8d1be25 100644
|
||||
--- a/t/lib/Test.pm
|
||||
+++ b/t/lib/Test.pm
|
||||
@@ -7,6 +7,7 @@ use Exporter ();
|
||||
use File::Spec ();
|
||||
use Test::More ();
|
||||
|
||||
+my $parent;
|
||||
use vars qw{$VERSION @ISA @EXPORT @CALL_FUNCS};
|
||||
BEGIN {
|
||||
$VERSION = '1.29';
|
||||
@@ -15,6 +16,7 @@ BEGIN {
|
||||
|
||||
# Allow tests to load modules bundled in /inc
|
||||
unshift @INC, 'inc';
|
||||
+ $parent = $$;
|
||||
}
|
||||
|
||||
# Always load the DBI module
|
||||
@@ -22,6 +24,7 @@ use DBI ();
|
||||
|
||||
# Delete temporary files
|
||||
sub clean {
|
||||
+ return if $$ != $parent;
|
||||
unlink( 'foo' );
|
||||
unlink( 'foo-journal' );
|
||||
}
|
||||
--
|
||||
1.7.1
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
--- DBD-SQLite-1.31/t/43_fts3.t 2010-09-15 08:16:43.000000000 +0100
|
||||
+++ DBD-SQLite-1.31/t/43_fts3.t 2010-09-15 14:50:58.529161202 +0100
|
||||
@@ -90,6 +90,11 @@
|
||||
}
|
||||
|
||||
# queries
|
||||
+SKIP: {
|
||||
+ skip "These tests require SQLite compiled with ENABLE_FTS3_PARENTHESIS option", scalar @tests
|
||||
+ unless DBD::SQLite->can('compile_options') &&
|
||||
+ grep /ENABLE_FTS3_PARENTHESIS/, DBD::SQLite::compile_options();
|
||||
+
|
||||
my $sql = "SELECT docid FROM try_fts3 WHERE content MATCH ?";
|
||||
for my $t (@tests) {
|
||||
my ($query, @expected) = @$t;
|
||||
@@ -97,6 +102,9 @@
|
||||
my $results = $dbh->selectcol_arrayref($sql, undef, $query);
|
||||
is_deeply($results, \@expected, "$query (unicode is $use_unicode)");
|
||||
}
|
||||
+
|
||||
+}
|
||||
+
|
||||
}
|
||||
|
||||
|
||||
@ -1,16 +1,12 @@
|
||||
Name: perl-DBD-SQLite
|
||||
Version: 1.31
|
||||
Release: 3%{?dist}
|
||||
Version: 1.33
|
||||
Release: 1%{?dist}
|
||||
Summary: SQLite DBI Driver
|
||||
|
||||
Group: Development/Libraries
|
||||
License: GPL+ or Artistic
|
||||
URL: http://search.cpan.org/dist/DBD-SQLite/
|
||||
Source0: http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/DBD-SQLite-%{version}.tar.gz
|
||||
patch0: perl-DBD-SQLite-bz543982.patch
|
||||
Patch1: perl-DBD-SQLite-1.31-fts3-test.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
# if sqlite >= 3.1.3 then
|
||||
# perl-DBD-SQLite uses the external library
|
||||
# else
|
||||
@ -21,7 +17,6 @@ BuildRequires: perl(Test::More) >= 0.42
|
||||
BuildRequires: perl(File::Spec) >= 0.82
|
||||
# Prevent bug #443495
|
||||
BuildRequires: perl(DBI) >= 1.607
|
||||
|
||||
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
|
||||
|
||||
%{?perl_default_filter}
|
||||
@ -36,39 +31,33 @@ libraries.
|
||||
%prep
|
||||
%setup -q -n DBD-SQLite-%{version}
|
||||
%patch0 -p1 -b .bz543982
|
||||
%patch1 -p1 -b .fts3-test
|
||||
|
||||
%build
|
||||
CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
|
||||
make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
|
||||
|
||||
CFLAGS="%{optflags}" %{__perl} Makefile.PL INSTALLDIRS=vendor
|
||||
make %{?_smp_mflags} OPTIMIZE="%{optflags}"
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
|
||||
find $RPM_BUILD_ROOT -type f \( -name .packlist -o \
|
||||
-name '*.bs' -size 0 \) -exec rm -f {} ';'
|
||||
find $RPM_BUILD_ROOT -depth -type d -empty -exec rmdir {} ';'
|
||||
%{_fixperms} $RPM_BUILD_ROOT/*
|
||||
|
||||
make pure_install PERL_INSTALL_ROOT=%{buildroot}
|
||||
find %{buildroot} -type f \( -name .packlist -o \
|
||||
-name '*.bs' -size 0 \) -exec rm -f {} ';'
|
||||
find %{buildroot} -depth -type d -empty -exec rmdir {} ';'
|
||||
%{_fixperms} %{buildroot}/*
|
||||
|
||||
%check
|
||||
make test
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc Changes README
|
||||
%{perl_vendorarch}/auto/*
|
||||
%{perl_vendorarch}/DBD/
|
||||
%{_mandir}/man3/*.3pm*
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon May 30 2011 Petr Sabata <contyk@redhat.com> - 1.33-1
|
||||
- 1.33 bump
|
||||
- BuildRoot and defattr cleanup
|
||||
- Dropping the FTS3 tests patch; included upstream
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.31-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user