[subversion/f20: 1/9] use --enable-sqlite-compatibility-version

jorton jorton at fedoraproject.org
Mon Dec 2 09:57:03 UTC 2013


commit 177b3ae9eeacfe07685d02e6cc105e48a03db72e
Author: Joe Orton <jorton at redhat.com>
Date:   Wed Nov 6 11:29:40 2013 +0000

    use --enable-sqlite-compatibility-version

 subversion.spec |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/subversion.spec b/subversion.spec
index c7a80a8..59c0e2f 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -15,6 +15,8 @@
 %define dbdevel libdb-devel
 %endif
 
+%global sqlite_minver 3.7.12
+
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}}
@@ -47,7 +49,7 @@ 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
 BuildRequires: libserf-devel >= 1.2.1, cyrus-sasl-devel
-BuildRequires: sqlite-devel >= 3.4.0, file-devel, systemd-units
+BuildRequires: sqlite-devel >= %{sqlite_minver}, file-devel, systemd-units
 # Any apr-util crypto backend needed
 BuildRequires: apr-util-openssl
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -203,8 +205,7 @@ export svn_cv_ruby_sitedir_archsuffix=""
 sed -i 's/-fpie/-fPIE/' Makefile.in
 %endif
 
-export CFLAGS="$RPM_OPT_FLAGS -DSVN_SQLITE_MIN_VERSION_NUMBER=3007012 \
-       -DSVN_SQLITE_MIN_VERSION=\\\"3.7.12\\\""
+export CFLAGS="$RPM_OPT_FLAGS"
 export APACHE_LDFLAGS="-Wl,-z,relro,-z,now"
 export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
 %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
@@ -216,6 +217,7 @@ export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
         --disable-static --with-sasl=%{_prefix} \
         --with-libmagic=%{_prefix} \
         --with-gnome-keyring \
+        --enable-sqlite-compatibility-version=%{sqlite_minver} \
 %if %{with_java}
         --enable-javahl \
         --with-junit=%{_prefix}/share/java/junit.jar \


More information about the scm-commits mailing list