From e78c6f5b835f02cb575e9f28547aa6d401c440b874bc70df93fb91a591b1f14d Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Fri, 15 Jun 2012 15:17:53 +0000
Subject: [PATCH] Accepting request 124760 from
 home:AndreasStieger:branches:devel:tools:scm:svn

- make build against neon optional, default on, like serf

  mainly due to discussion on svn-dev ml about possible
  removal of ra_neon for 1.8.0

OBS-URL: https://build.opensuse.org/request/show/124760
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=100
---
 subversion.changes |  5 +++++
 subversion.spec    | 17 +++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/subversion.changes b/subversion.changes
index 7baded1..e7bc932 100644
--- a/subversion.changes
+++ b/subversion.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jun 12 20:02:22 UTC 2012 - andreas.stieger@gmx.de
+
+- make build against neon optional, default on, like serf
+
 -------------------------------------------------------------------
 Thu Jun  7 17:08:01 UTC 2012 - andreas.stieger@gmx.de
 
diff --git a/subversion.spec b/subversion.spec
index 4193fc5..f30d0a3 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -33,6 +33,7 @@
 %define with_kde4_kwallet  0%{?suse_version} > 1100
 %define with_gnome_keyring 0%{?suse_version} > 1100
 
+%bcond_without	neon
 %bcond_without	serf
 
 # run build --with=regression_tests to run test suite
@@ -98,12 +99,14 @@ BuildRequires:  junit
 %else
 %define with_java 0
 %endif
+%if %{with neon}
 %if 0%{?suse_version} > 1030
 BuildRequires:  libneon-devel
 %else
 BuildRequires:  neon-devel
 BuildRequires:  openldap2-devel
 %endif # suse_version > 1030
+%endif # with neon
 %if %{with regression_tests}
 # for check section, to find a free port:
 BuildRequires:  iproute2
@@ -459,7 +462,9 @@ export LDFLAGS=-pie
 export PATH="${SWIG_ROOT}/bin:${PATH}"
 %configure \
 	--with-editor="vim -c 'set tw=72 et' " \
+%if %{with neon}
 	--with-neon=%{_prefix} \
+%endif
 %if %{with serf} 
 	--with-serf=%{_prefix} \
 %endif
@@ -583,6 +588,7 @@ rm -f %{buildroot}/var/adm/perl-modules/subversion
 
 #
 # double check that the essential repository access schemes have been compiled in
+# requires at least one http library: neon or serf
 #
 schemes=$(LD_LIBRARY_PATH="${RPM_BUILD_ROOT}%{_libdir}" "${RPM_BUILD_ROOT}%{_bindir}/svn" --version | %__grep "'" | cut -d\' -f2 | sort -u)
 # reset vim syntax: '
@@ -591,6 +597,17 @@ http
 https
 svn"
 #
+%if %{with neon}
+#
+# double check that when building with neon support, ra_neon is actually available and handles http and https schemes
+#
+serf_schemes=$(LD_LIBRARY_PATH="${RPM_BUILD_ROOT}%{_libdir}" "${RPM_BUILD_ROOT}%{_bindir}/svn" --version | %__grep -A2 "ra_neon" | %__grep "'" | cut -d\' -f2 )
+# reset vim syntax: '
+test "$serf_schemes" = "http
+https"
+#
+%endif # with neon
+#
 %if %{with serf}
 #
 # double check that when building with serf support, ra_serf is actually available and handles http and https schemes