From f80a2ee5699976fda05b7dd91871d32c3380553ad33c978f48090202b3e35f3f Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Wed, 27 Jul 2011 14:15:40 +0000
Subject: [PATCH] - remove intree copies of sqlite and swig if version is new
 enough

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=53
---
 subversion.changes |  5 +++++
 subversion.spec    | 14 ++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/subversion.changes b/subversion.changes
index dd45aac..e77bf6a 100644
--- a/subversion.changes
+++ b/subversion.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jul 27 16:15:24 CEST 2011 - dmueller@suse.de
+
+- remove intree copies of sqlite and swig if version is new enough
+
 -------------------------------------------------------------------
 Mon May 30 14:07:41 UTC 2011 - stsp@elego.de
 
diff --git a/subversion.spec b/subversion.spec
index 711e272..ca9dfe0 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -18,13 +18,11 @@
 
 # norootforbuild
 
-%if 0%{?sles_version} > 9
-%define with_ruby          1
-%endif
+%define with_ruby          0%{?suse_version} > 1110
 %define with_python_ctypes 0%{?sles_version} > 9
 %define with_intree_swig 0%{?suse_version} < 1110
 %define with_gnome_keyring 0%{?suse_version} > 1010
-%define with_intree_sqlite 0%{?suse_version} < 1120
+%define with_intree_sqlite 0%{?suse_version} < 1110
 %define with_kde4_kwallet  0%{?suse_version} > 1030
 
 Name:           subversion
@@ -128,6 +126,8 @@ Source43:       subversion.svndiff.sh
 %if %with_intree_swig
 # http://ovh.dl.sourceforge.net/project/swig/swig/swig-%{swig_version}/swig-%{swig_version}.tar.gz
 Source90:       swig-%{swig_version}.tar.bz2
+%else
+BuildRequires:  swig
 %endif
 %if %with_intree_sqlite
 # http://www.sqlite.org/sqlite-amalgamation-%{sqlite_version}.tar.gz
@@ -312,7 +312,11 @@ client is svn.
 %endif # with_gnome_keyring
 
 %prep
+%if %with_intree_swig
 %setup -q -n subversion-%{version} -b 90
+%else
+%setup -q -n subversion-%{version}
+%endif
 #
 %if %with_intree_sqlite
 %__install -d ./sqlite-amalgamation
@@ -477,7 +481,9 @@ export PATH="${SWIG_ROOT}/bin:${PATH}"
     --with-junit="%{_usr}/share/java/junit.jar" \
 %endif
 	--with-jikes=no \
+%if %with_intree_swig
 	--with-swig="$SWIG_ROOT" \
+%endif
 %if %with_intree_sqlite
 	--with-sqlite="./sqlite-amalgamation/sqlite3.c" \
 %else