f38
Jitka Plesnikova 8 years ago
parent a6283c22a0
commit e946185930

1
.gitignore vendored

@ -11,3 +11,4 @@ DBD-SQLite-1.29.tar.gz
/DBD-SQLite-1.48.tar.gz /DBD-SQLite-1.48.tar.gz
/DBD-SQLite-1.50.tar.gz /DBD-SQLite-1.50.tar.gz
/DBD-SQLite-1.52.tar.gz /DBD-SQLite-1.52.tar.gz
/DBD-SQLite-1.54.tar.gz

@ -1,37 +0,0 @@
From 5687040e291c06a7e49cae9cfae0f2be96b05ef3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Sun, 24 Jul 2016 11:15:52 +0200
Subject: [PATCH] Always register perl FTS3 tokenizer with sqlite before 3.11.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Disabling perl FTS3 tokenizer by default caused t/43_fts3.t failures
if building against sqlite < 3.11.0. That was caused by assymetry
between enabling the support (purely on SQLITE_ENABLE_FTS3_TOKENIZER
environemnt variable) and skipping the tests (on version and
ENABLE_FTS3_TOKENIZER compile option).
CPAN RT#112474
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
SQLite.xs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SQLite.xs b/SQLite.xs
index f20e511..06fc425 100644
--- a/SQLite.xs
+++ b/SQLite.xs
@@ -288,7 +288,7 @@ register_fts3_perl_tokenizer(dbh)
ALIAS:
DBD::SQLite::db::sqlite_register_fts3_perl_tokenizer = 1
CODE:
-#if SQLITE_ENABLE_FTS3_TOKENIZER
+#if SQLITE_VERSION_NUMBER < 3011000 || SQLITE_ENABLE_FTS3_TOKENIZER
RETVAL = sqlite_db_register_fts3_perl_tokenizer(aTHX_ dbh);
#else
RETVAL = 0;
--
2.5.5

@ -1,5 +1,5 @@
Name: perl-DBD-SQLite Name: perl-DBD-SQLite
Version: 1.52 Version: 1.54
Release: 1%{?dist} Release: 1%{?dist}
Summary: SQLite DBI Driver Summary: SQLite DBI Driver
Group: Development/Libraries Group: Development/Libraries
@ -9,8 +9,6 @@ Source0: http://search.cpan.org/CPAN/authors/id/I/IS/ISHIGAKI/DBD-SQLite-
Patch0: perl-DBD-SQLite-bz543982.patch Patch0: perl-DBD-SQLite-bz543982.patch
# Remove notes about bundled sqlite C source from man page and README # Remove notes about bundled sqlite C source from man page and README
Patch1: DBD-SQLite-1.50-Remove-bundled-source-extentions.patch Patch1: DBD-SQLite-1.50-Remove-bundled-source-extentions.patch
# Enable perl FTS3 tokenizer with sqlite older than 3.11.0, CPAN RT#112474
Patch2: DBD-SQLite-1.51_05-Always-register-perl-FTS3-tokenizer-with-sqlite-befo.patch
# if sqlite >= 3.1.3 then # if sqlite >= 3.1.3 then
# perl-DBD-SQLite uses the external library # perl-DBD-SQLite uses the external library
# else # else
@ -65,7 +63,6 @@ libraries.
%setup -q -n DBD-SQLite-%{version} %setup -q -n DBD-SQLite-%{version}
%patch0 -p1 -b .bz543982 %patch0 -p1 -b .bz543982
%patch1 -p1 %patch1 -p1
%patch2 -p1
# Remove bundled sqlite libraries (BZ#1059154) # Remove bundled sqlite libraries (BZ#1059154)
# System libraries will be used # System libraries will be used
rm sqlite* rm sqlite*
@ -91,6 +88,9 @@ make test
%{_mandir}/man3/*.3pm* %{_mandir}/man3/*.3pm*
%changelog %changelog
* Mon Jan 02 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1.54-1
- 1.54 bump
* Wed Nov 16 2016 Jitka Plesnikova <jplesnik@redhat.com> - 1.52-1 * Wed Nov 16 2016 Jitka Plesnikova <jplesnik@redhat.com> - 1.52-1
- 1.52 bump - 1.52 bump

@ -1 +1 @@
a54c2e8ab74587c3b6f8045fddc5aba5 DBD-SQLite-1.52.tar.gz SHA512 (DBD-SQLite-1.54.tar.gz) = a8daff59679973467dff80c013b6ff9d7229a505b62c0312bdf7f9288af64dcd2e99f889b66eb98103b0e6ac7a9b0fa7c9c517c5c2673ee7f84b3b6b5d26173e

Loading…
Cancel
Save