rpms
/
perl-DBD-SQLite
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.58 bump

Browse Source
f38
Petr Písař 7 years ago
parent 1636697935
commit bfc26ef848
4 changed files with 106 additions and 13 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape View File

@ -13,3 +13,4 @@ DBD-SQLite-1.29.tar.gz
/DBD-SQLite-1.52.tar.gz /DBD-SQLite-1.52.tar.gz
/DBD-SQLite-1.54.tar.gz /DBD-SQLite-1.54.tar.gz
/DBD-SQLite-1.56.tar.gz /DBD-SQLite-1.56.tar.gz
/DBD-SQLite-1.58.tar.gz

65
DBD-SQLite-1.58-Unbundle-Test-NoWarnings.patch
Unescape View File

@ -0,0 +1,65 @@
From 1944bbf4f29181690097e61f1410d30d43343b02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Thu, 29 Mar 2018 10:40:17 +0200
Subject: [PATCH] Unbundle Test::NoWarnings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
Makefile.PL | 6 ++----
t/virtual_table/11_filecontent_fulltext.t | 7 ++-----
diff --git a/Makefile.PL b/Makefile.PL
index fcdf771..3860eda 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -330,8 +330,7 @@ WriteMakefile(
'Tie::Hash' => 0,
'File::Spec' => (WINLIKE ? '3.27' : '0.82'),
'DBI' => $DBI_required,
- 'Test::More' => '0.47', # Test::NoWarnings
- 'Test::Builder' => '0.86', # Test::NoWarnings
+ 'Test::More' => 0,
( WINLIKE ? (
'Win32' => '0.30',
) : () ),
@@ -363,8 +362,7 @@ WriteMakefile(
build_requires => {
'File::Spec' => (WINLIKE ? '3.27' : '0.82'),
'Test::More' => '0.42',
- # Bundled in /inc
- # 'Test::NoWarnings' => '0.081',
+ 'Test::NoWarnings' => '0.081',
},
requires => {
'Tie::Hash' => 0,
diff --git a/t/virtual_table/11_filecontent_fulltext.t b/t/virtual_table/11_filecontent_fulltext.t
index b95b115..7e805f1 100644
--- a/t/virtual_table/11_filecontent_fulltext.t
+++ b/t/virtual_table/11_filecontent_fulltext.t
@@ -27,9 +27,7 @@ my @tests = (
lib/DBD/SQLite/VirtualTable/FileContent.pm
lib/DBD/SQLite/VirtualTable/PerlData.pm]],
["install_method" => qw[lib/DBD/SQLite.pm]],
- ['"use strict"' => qw[inc/Test/NoWarnings.pm
- inc/Test/NoWarnings/Warning.pm
- lib/DBD/SQLite.pm
+ ['"use strict"' => qw[lib/DBD/SQLite.pm
lib/DBD/SQLite/Constants.pm
lib/DBD/SQLite/VirtualTable.pm
lib/DBD/SQLite/VirtualTable/FileContent.pm
@@ -42,8 +40,7 @@ my @tests = (
# literally.
if (grep /ENABLE_FTS3_PARENTHESIS/, DBD::SQLite::compile_options()) {
push @tests, (
- ['"use strict" AND "use warnings"' => qw[inc/Test/NoWarnings.pm
- lib/DBD/SQLite/Constants.pm
+ ['"use strict" AND "use warnings"' => qw[lib/DBD/SQLite/Constants.pm
lib/DBD/SQLite/VirtualTable.pm
lib/DBD/SQLite/VirtualTable/FileContent.pm
lib/DBD/SQLite/VirtualTable/PerlData.pm
--
2.14.3

51
perl-DBD-SQLite.spec
Unescape View File

@ -1,36 +1,53 @@
# Run optional test
%bcond_without perl_DBD_SQLite_enables_optional_test
Name: perl-DBD-SQLite Name: perl-DBD-SQLite
Version: 1.56 Version: 1.58
Release: 2%{?dist} Release: 1%{?dist}
Summary: SQLite DBI Driver Summary: SQLite DBI Driver
Group: Development/Libraries # lib/DBD/SQLite.pm: GPL+ or Artistic
# LICENSE: GPL+ or Artistic
## unbundled
# inc/Test/NoWarnings.pm: LGPLv2+
# sqlite3.c: Public Domain (copied from sqlite)
# sqlite3.h: Public Domain (copied from sqlite)
# sqlite3ext.h: Public Domain (copied from sqlite)
License: (GPL+ or Artistic) and Public Domain License: (GPL+ or Artistic) and Public Domain
URL: http://search.cpan.org/dist/DBD-SQLite/ URL: http://search.cpan.org/dist/DBD-SQLite/
Source0: http://search.cpan.org/CPAN/authors/id/I/IS/ISHIGAKI/DBD-SQLite-%{version}.tar.gz Source0: http://search.cpan.org/CPAN/authors/id/I/IS/ISHIGAKI/DBD-SQLite-%{version}.tar.gz
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
# if sqlite >= 3.1.3 then # Adapt tests to unbundled Test::NoWarnings
Patch2: DBD-SQLite-1.58-Unbundle-Test-NoWarnings.patch
# if sqlite >= 3.6.0 then
# perl-DBD-SQLite uses the external library # perl-DBD-SQLite uses the external library
# else # else
# perl-DBD-SQLite is self-contained (uses the sqlite local copy) # perl-DBD-SQLite is self-contained (uses the sqlite local copy)
# But we always unbundle sqlite.
BuildRequires: sqlite-devel BuildRequires: sqlite-devel
BuildRequires: coreutils BuildRequires: coreutils
BuildRequires: findutils BuildRequires: findutils
BuildRequires: gcc BuildRequires: gcc
BuildRequires: make BuildRequires: make
BuildRequires: perl-interpreter
BuildRequires: perl-devel BuildRequires: perl-devel
BuildRequires: perl-generators BuildRequires: perl-generators
BuildRequires: perl-interpreter
BuildRequires: perl(:VERSION) >= 5.6
BuildRequires: perl(base) BuildRequires: perl(base)
BuildRequires: perl(Config) BuildRequires: perl(Config)
BuildRequires: perl(constant) BuildRequires: perl(constant)
# Prevent bug #443495 # Prevent bug #443495
BuildRequires: perl(DBI) >= 1.607 BuildRequires: perl(DBI) >= 1.607
BuildRequires: perl(DynaLoader) BuildRequires: perl(DBI::DBD)
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76
BuildRequires: perl(File::Spec) >= 0.82 BuildRequires: perl(File::Spec) >= 0.82
BuildRequires: perl(Scalar::Util)
BuildRequires: perl(strict) BuildRequires: perl(strict)
# Run-time:
BuildRequires: perl(DynaLoader)
# File::Basename not used
BuildRequires: perl(locale)
BuildRequires: perl(Scalar::Util)
BuildRequires: perl(Tie::Hash) BuildRequires: perl(Tie::Hash)
BuildRequires: perl(warnings) BuildRequires: perl(warnings)
BuildRequires: sed BuildRequires: sed
@ -44,11 +61,14 @@ BuildRequires: perl(File::Spec::Functions)
BuildRequires: perl(File::Temp) BuildRequires: perl(File::Temp)
BuildRequires: perl(FindBin) BuildRequires: perl(FindBin)
BuildRequires: perl(lib) BuildRequires: perl(lib)
BuildRequires: perl(locale) # POSIX not used
BuildRequires: perl(Test::Builder) BuildRequires: perl(Test::More)
BuildRequires: perl(Test::More) >= 0.42 BuildRequires: perl(Test::NoWarnings) >= 0.081
# Win32 not used
%if %{with perl_DBD_SQLite_enables_optional_test}
# Optional tests
BuildRequires: perl(Unicode::UCD) BuildRequires: perl(Unicode::UCD)
BuildRequires: perl(vars) %endif
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
%{?perl_default_filter} %{?perl_default_filter}
@ -62,12 +82,16 @@ libraries.
%prep %prep
%setup -q -n DBD-SQLite-%{version} %setup -q -n DBD-SQLite-%{version}
%patch0 -p1 -b .bz543982 %patch0 -p1
%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*
sed -i -e '/^sqlite/ d' MANIFEST sed -i -e '/^sqlite/ d' MANIFEST
# Remove bundled modules
rm -rf inc
sed -i -e '/^inc\// d' MANIFEST
%build %build
CFLAGS="%{optflags}" perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 CFLAGS="%{optflags}" perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
@ -88,6 +112,9 @@ make test
%{_mandir}/man3/*.3pm* %{_mandir}/man3/*.3pm*
%changelog %changelog
* Thu Mar 29 2018 Petr Pisar <ppisar@redhat.com> - 1.58-1
- 1.58 bump
* Thu Mar 1 2018 Florian Weimer <fweimer@redhat.com> - 1.56-2 * Thu Mar 1 2018 Florian Weimer <fweimer@redhat.com> - 1.56-2
- Rebuild with new redhat-rpm-config/perl build flags - Rebuild with new redhat-rpm-config/perl build flags

2
sources
Unescape View File

@ -1 +1 @@
SHA512 (DBD-SQLite-1.56.tar.gz) = 1c9be3557691f76a9e543fe4bd6656a6b82f53fba4bc05261a55affa0a38b4eaa1cf876da975234c9c09985ba25b21f6f7a735f1cc47104169edf7fdd3a2e314 SHA512 (DBD-SQLite-1.58.tar.gz) = 080d1e304fb0d43926ce0345df3367132c317ba113bdc11952c0a159bc68d988a024828a28e66be267f82e07731dee225723854fb80914ba7c476b27dbdeb212

Write Preview
Loading…
Cancel
Save