From 24d8011c35fb510c9d603232f43a8bf360e23f111db7df9ff49cc396cc924a8b Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 14 Jan 2009 23:40:49 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/perl-DBD-SQLite?expand=0&rev=5 --- makefile-forgiving.diff | 44 ----------------------------------------- perl-DBD-SQLite.changes | 5 +++++ perl-DBD-SQLite.spec | 26 ++++++++++++++++-------- 3 files changed, 23 insertions(+), 52 deletions(-) delete mode 100644 makefile-forgiving.diff diff --git a/makefile-forgiving.diff b/makefile-forgiving.diff deleted file mode 100644 index c67eb83..0000000 --- a/makefile-forgiving.diff +++ /dev/null @@ -1,44 +0,0 @@ ---- DBD-SQLite-1.10/Makefile.PL.orig 2005-06-20 14:45:11.000000000 +0200 -+++ DBD-SQLite-1.10/Makefile.PL 2005-12-02 21:01:25.000000000 +0100 -@@ -65,7 +65,7 @@ - - # Now, check for a compatible sqlite3 - unless ($force_local) { -- my ($dir, $file, $fh, $version); -+ my ($dir, $file, $fh, $version, $version2); - print "Checking installed SQLite version...\n"; - if ($sqlite_inc) { - open($fh, '< ' . File::Spec->catfile($sqlite_inc, 'sqlite3.h')) -@@ -84,6 +84,12 @@ - next unless (-f $file); - open($fh, "< $file") or die "Error opening $file: $!"; - while (defined($_ = <$fh>)) { -+ if (/\#define\s+SQLITE_VERSION\s+"(\d+)\.(\d+).(\d+)"/) { -+ $version2 = 0+sprintf "%d%03d%03d", $1,$2,$3; -+ # jw 2005-12-02 -+ # I hate it! sqlite broke their SQLITE_VERSION_NUMBER -+ # again. They say 3000000 although they are 3.2.7 -+ } - if (/\#define\s+SQLITE_VERSION_NUMBER\s+(\d+)/) { - $version = $1; - last; -@@ -93,14 +99,18 @@ - last if $version; - } - } -+ $version = $version2 unless defined $version; -+ $version = $version2 if defined $version2 and $version2 > $version; -+ - unless ($version && ($version >= 3001003)) { -+ warn "sqlite3.h found of version $version\n" if $version; - warn "SQLite version must be at least 3.1.3. No header file at that\n"; - warn "version or higher was found. Using the local version instead.\n"; - $force_local = 1; - undef $sqlite_lib; - undef $sqlite_inc; - } else { -- print "Looks good\n"; -+ print "Looks good ($version)\n"; - } - } - diff --git a/perl-DBD-SQLite.changes b/perl-DBD-SQLite.changes index de9edd7..d4a6465 100644 --- a/perl-DBD-SQLite.changes +++ b/perl-DBD-SQLite.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 14 23:00:41 CET 2009 - jw@suse.de + +- bnc#466021 fixed. + ------------------------------------------------------------------- Thu Feb 7 13:35:24 CET 2008 - schwab@suse.de diff --git a/perl-DBD-SQLite.spec b/perl-DBD-SQLite.spec index d079887..bc79725 100644 --- a/perl-DBD-SQLite.spec +++ b/perl-DBD-SQLite.spec @@ -1,27 +1,34 @@ # # spec file for package perl-DBD-SQLite (Version 1.14) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: perl-DBD-SQLite BuildRequires: perl-DBI sqlite-devel Summary: The DBD::SQLite is a self contained RDBMS in a DBI driver Version: 1.14 -Release: 11 +Release: 71 License: Artistic License; GPL v2 or later Group: Development/Libraries/Perl Source0: http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/DBD-SQLite-%{version}.tar.gz -Patch0: makefile-forgiving.diff Patch1: dbimp-no_uninit.diff Patch2: sqlite3-finalize.diff -Url: http://www.cpan.org +Url: http://search.cpan.org/~msergeant/DBD-SQLite-1.14 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: perl-DBI sqlite Requires: perl = %{perl_version} @@ -40,6 +47,8 @@ It supports quite a lot of features, such as transactions (atomic commit and rollback), indexes, DBA-free operation, a large subset of SQL92 supported, and more. +Linking against sqlite3-devel + Authors: @@ -48,7 +57,6 @@ Authors: %prep %setup -q -n DBD-SQLite-%{version} -#%patch -p1 %patch1 -p1 %patch2 @@ -57,7 +65,7 @@ perl Makefile.PL OPTIMIZE="$RPM_OPT_FLAGS" make %check -make test || true +make test %install make DESTDIR=$RPM_BUILD_ROOT install_vendor @@ -75,6 +83,8 @@ rm -rf $RPM_BUILD_ROOT /var/adm/perl-modules/* %changelog +* Wed Jan 14 2009 jw@suse.de +- bnc#466021 fixed. * Thu Feb 07 2008 schwab@suse.de - Don't call sqlite3_finalize twice. * Sun Jan 13 2008 coolo@suse.de