- Add a versioned runtime requirement for sqlite and pass it to

configure via --enable-sqlite-compatibility-version to allow
  running with sqlite older than at build time but compatible.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=184
This commit is contained in:
2014-11-01 22:32:25 +00:00
committed by Git OBS Bridge
parent 6d8dba7e85
commit 7c5ec4e9bb
2 changed files with 11 additions and 2 deletions

View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Nov 1 22:17:40 UTC 2014 - andreas.stieger@gmx.de
- Add a versioned runtime requirement for sqlite and pass it to
configure via --enable-sqlite-compatibility-version to allow
running with sqlite older than at build time but compatible.
-------------------------------------------------------------------
Sat Sep 27 22:56:01 UTC 2014 - andreas.stieger@gmx.de

View File

@@ -26,6 +26,7 @@
%define apache_libexecdir %(%{apxs} -q LIBEXECDIR)
%define apache_sysconfdir %(%{apxs} -q SYSCONFDIR)
%define apache_mmn %(MMN="$(%{apxs} -q LIBEXECDIR)_MMN"; test -x "$MMN" && "$MMN")
%define sqlite_minimum_version 3.7.12
%if 0%{?suse_version} > 1140
%define with_systemd 1
BuildRequires: pkgconfig(systemd)
@@ -33,7 +34,6 @@ BuildRequires: pkgconfig(systemd)
%endif
%bcond_without python_ctypes
%bcond_with all_regression_tests
Name: subversion
Version: 1.8.10
Release: 0
@@ -88,10 +88,11 @@ BuildRequires: pkgconfig
BuildRequires: python-devel
BuildRequires: python-xml
BuildRequires: ruby-devel >= 1.8.2
BuildRequires: sqlite3-devel >= 3.7.12
BuildRequires: sqlite3-devel >= %{sqlite_minimum_version}
BuildRequires: swig
BuildRequires: update-alternatives
BuildRequires: zlib-devel
Requires: libsqlite3-0 >= %{sqlite_minimum_version}
Requires(post): %fillup_prereq
Requires(pre): pwdutils
Provides: subversion-javahl = %{version}-%{release}
@@ -279,6 +280,7 @@ export LDFLAGS="-pie"
--with-junit="%{_datadir}/java/junit.jar" \
--with-jikes=no \
--with-sqlite="%{_prefix}" \
--enable-sqlite-compatibility-version=%{sqlite_minimum_version} \
--with-gnome-keyring \
--with-kwallet \
--disable-mod-activation \