commit 35a04883da24df3f369101473afdc7e429dc78ac
Author: Jitka Plesnikova <jplesnik@xxxxxxxxxx>
Date: Tue Jul 15 13:22:17 2014 +0200
Removed bundled sqlite library and updated man page (BZ#1059154)
...ite-1.42-Remove-bundled-source-extentions.patch | 81 ++++++++++++++++++++
perl-DBD-SQLite.spec | 14 +++-
2 files changed, 93 insertions(+), 2 deletions(-)
---
diff --git a/DBD-SQLite-1.42-Remove-bundled-source-extentions.patch b/DBD-SQLite-1.42-Remove-bundled-source-extentions.patch
new file mode 100644
index 0000000..44c57e1
--- /dev/null
+++ b/DBD-SQLite-1.42-Remove-bundled-source-extentions.patch
@@ -0,0 +1,81 @@
+diff -up DBD-SQLite-1.42/README.orig DBD-SQLite-1.42/README
+--- DBD-SQLite-1.42/README.orig 2014-07-15 09:35:34.645802758 +0200
++++ DBD-SQLite-1.42/README 2014-07-15 09:35:51.249990673 +0200
+@@ -1222,36 +1222,6 @@ R* TREE SUPPORT
+ using callbacks, as mentioned in the prior link, have not been
+ implemented yet.
+
+-FOR DBD::SQLITE EXTENSION AUTHORS
+- Since 1.30_01, you can retrieve the bundled sqlite C source and/or
+- header like this:
+-
+- use File::ShareDir 'dist_dir';
+- use File::Spec::Functions 'catfile';
+-
+- # the whole sqlite3.h header
+- my $sqlite3_h = catfile(dist_dir('DBD-SQLite'), 'sqlite3.h');
+-
+- # or only a particular header, amalgamated in sqlite3.c
+- my $what_i_want = 'parse.h';
+- my $sqlite3_c = catfile(dist_dir('DBD-SQLite'), 'sqlite3.c');
+- open my $fh, '<', $sqlite3_c or die $!;
+- my $code = do { local $/; <$fh> };
+- my ($parse_h) = $code =~ m{(
+- /\*+[ ]Begin[ ]file[ ]$what_i_want[ ]\*+
+- .+?
+- /\*+[ ]End[ ]of[ ]$what_i_want[ ]\*+/
+- )}sx;
+- open my $out, '>', $what_i_want or die $!;
+- print $out $parse_h;
+- close $out;
+-
+- You usually want to use this in your extension's "Makefile.PL", and you
+- may want to add DBD::SQLite to your extension's "CONFIGURE_REQUIRES" to
+- ensure your extension users use the same C source/header they use to
+- build DBD::SQLite itself (instead of the ones installed in their
+- system).
+-
+ TO DO
+ The following items remain to be done.
+
+diff -up DBD-SQLite-1.42/lib/DBD/SQLite.pm.orig DBD-SQLite-1.42/lib/DBD/SQLite.pm
+--- DBD-SQLite-1.42/lib/DBD/SQLite.pm.orig 2014-07-15 09:36:12.006225578 +0200
++++ DBD-SQLite-1.42/lib/DBD/SQLite.pm 2014-07-15 09:37:04.244816776 +0200
+@@ -2604,37 +2604,6 @@ For more detail, please see the SQLite R
+ queries using callbacks, as mentioned in the prior link, have not been
+ implemented yet.
+
+-=head1 FOR DBD::SQLITE EXTENSION AUTHORS
+-
+-Since 1.30_01, you can retrieve the bundled sqlite C source and/or
+-header like this:
+-
+- use File::ShareDir 'dist_dir';
+- use File::Spec::Functions 'catfile';
+-
+- # the whole sqlite3.h header
+- my $sqlite3_h = catfile(dist_dir('DBD-SQLite'), 'sqlite3.h');
+-
+- # or only a particular header, amalgamated in sqlite3.c
+- my $what_i_want = 'parse.h';
+- my $sqlite3_c = catfile(dist_dir('DBD-SQLite'), 'sqlite3.c');
+- open my $fh, '<', $sqlite3_c or die $!;
+- my $code = do { local $/; <$fh> };
+- my ($parse_h) = $code =~ m{(
+- /\*+[ ]Begin[ ]file[ ]$what_i_want[ ]\*+
+- .+?
+- /\*+[ ]End[ ]of[ ]$what_i_want[ ]\*+/
+- )}sx;
+- open my $out, '>', $what_i_want or die $!;
+- print $out $parse_h;
+- close $out;
+-
+-You usually want to use this in your extension's C<Makefile.PL>,
+-and you may want to add DBD::SQLite to your extension's C<CONFIGURE_REQUIRES>
+-to ensure your extension users use the same C source/header they use
+-to build DBD::SQLite itself (instead of the ones installed in their
+-system).
+-
+ =head1 TO DO
+
+ The following items remain to be done.
diff --git a/perl-DBD-SQLite.spec b/perl-DBD-SQLite.spec
index 8eda79a..bf34df4 100644
--- a/perl-DBD-SQLite.spec
+++ b/perl-DBD-SQLite.spec
@@ -1,12 +1,14 @@
Name: perl-DBD-SQLite
Version: 1.42
-Release: 2%{?dist}
+Release: 3%{?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/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
+Patch1: DBD-SQLite-1.42-Remove-bundled-source-extentions.patch
# if sqlite >= 3.1.3 then
# perl-DBD-SQLite uses the external library
# else
@@ -46,6 +48,11 @@ libraries.
%prep
%setup -q -n DBD-SQLite-%{version}
%patch0 -p1 -b .bz543982
+%patch1 -p1
+# Remove bundled sqlite libraries (BZ#1059154)
+# System libraries will be used
+rm sqlite*
+sed -i -e '/^sqlite/ d' MANIFEST
%build
CFLAGS="%{optflags}" perl Makefile.PL INSTALLDIRS=vendor
@@ -67,6 +74,9 @@ make test
%{_mandir}/man3/*.3pm*
%changelog
+* Tue Jul 15 2014 Jitka Plesnikova <jplesnik@xxxxxxxxxx> - 1.42-3
+- Removed bundled sqlite library and updated man page (BZ#1059154)
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 1.42-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
