drop strict sqlite version requirement (#815396)

This commit is contained in:
Joe Orton 2012-04-24 08:18:42 +01:00
parent 2cfa41d072
commit 88c922219d
2 changed files with 28 additions and 1 deletions

View File

@ -0,0 +1,22 @@
Patch out strict version requirements for sqlite.
https://bugzilla.redhat.com/show_bug.cgi?id=815396
--- subversion-1.7.4/subversion/libsvn_subr/sqlite.c.sqlitever
+++ subversion-1.7.4/subversion/libsvn_subr/sqlite.c
@@ -740,14 +740,6 @@ static volatile svn_atomic_t sqlite_init
static svn_error_t *
init_sqlite(void *baton, apr_pool_t *pool)
{
- if (sqlite3_libversion_number() < SQLITE_VERSION_NUMBER)
- {
- return svn_error_createf(
- SVN_ERR_SQLITE_ERROR, NULL,
- _("SQLite compiled for %s, but running with %s"),
- SQLITE_VERSION, sqlite3_libversion());
- }
-
#if APR_HAS_THREADS
/* SQLite 3.5 allows verification of its thread-safety at runtime.

View File

@ -26,7 +26,7 @@
Summary: A Modern Concurrent Version Control System
Name: subversion
Version: 1.7.4
Release: 5%{?dist}
Release: 6%{?dist}
License: ASL 2.0
Group: Development/Tools
URL: http://subversion.apache.org/
@ -45,6 +45,7 @@ Patch4: subversion-1.7.2-ruby19.patch
Patch5: subversion-1.7.4-hashorder.patch
Patch6: subversion-1.7.4-httpd24.patch
Patch7: subversion-1.7.4-kwallet2.patch
Patch8: subversion-1.7.4-sqlitever.patch
BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
BuildRequires: %{dbdevel} >= 4.1.25, swig >= 1.3.24, gettext
BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
@ -184,6 +185,7 @@ This package includes supplementary tools for use with Subversion.
%patch5 -p1 -b .hashorder
%patch6 -p1 -b .httpd24
%patch7 -p1 -b .kwallet2
%patch8 -p1 -b .sqlitever
%build
# Regenerate the buildsystem, so that:
@ -479,6 +481,9 @@ fi
%endif
%changelog
* Tue Apr 24 2012 Joe Orton <jorton@redhat.com> - 1.7.4-6
- drop strict sqlite version requirement (#815396)
* Mon Apr 23 2012 Joe Orton <jorton@redhat.com> - 1.7.4-5
- switch to libdb-devel (#814090)