From 3dca11f626186670d0fae2b0a4564b39000d6c0df6e75f0a052f09304286e94e Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Thu, 21 Jul 2011 14:47:59 +0000
Subject: [PATCH] remove pure sles9 stuff

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=51
---
 subversion.spec | 43 +++++++++++--------------------------------
 1 file changed, 11 insertions(+), 32 deletions(-)

diff --git a/subversion.spec b/subversion.spec
index d00df42..65c312f 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -18,27 +18,14 @@
 
 # norootforbuild
 
-%if 0%{?sles_version} == 9
-%define __python %{_usr}/bin/python2.5
-%endif
-%if 0%{?sles_version} == 9
-%define with_ruby          0
-%define with_python_ctypes 0
-%else
+%if 0%{?sles_version} > 9
 %define with_ruby          1
 %define with_python_ctypes 0
 %endif
-%define with_intree_sqlite 1
-%if 0%{?suse_version} > 1010
-%define with_gnome_keyring 1
-%else
-%define with_gnome_keyring 0
-%endif # suse_version > 1010
-%if 0%{?suse_version} > 1030
-%define with_kde4_kwallet  1
-%else
-%define with_kde4_kwallet  0
-%endif # suse_version > 1030
+%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_kde4_kwallet  0%{?suse_version} > 1030
 
 Name:           subversion
 Version:        1.6.17
@@ -74,8 +61,7 @@ BuildRequires:  gnome-keyring-devel
 %endif
 %endif # with_gnome_keyring
 %if %with_kde4_kwallet
-BuildRequires:  dbus-1-devel
-BuildRequires:  kdelibs4-core libkde4-devel libqt4-devel
+BuildRequires:  dbus-1-devel kdelibs4-core libkde4-devel libqt4-devel
 %endif # with_kde4_kwallet
 %ifarch ppc ppc64
 # no JDK on ppc
@@ -139,8 +125,10 @@ Source12:       subversion.sysconfig.svnserve.remoteaccess
 Source13:       subversion.xinetd.svnserve
 Source42:       subversion.svngrep.sh
 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
+%endif
 %if %with_intree_sqlite
 # http://www.sqlite.org/sqlite-amalgamation-%{sqlite_version}.tar.gz
 Source91:       sqlite-amalgamation-%{sqlite_version}.tar.bz2
@@ -372,6 +360,7 @@ mkdir BUILDPATH
 export PATH="$PWD/BUILDPATH:$PATH"
 export PYTHON="%{_usr}/bin/python2.5"
 %endif
+%if %with_intree_swig
 SWIG_ROOT=`cd ..; pwd`/intree-swig
 pushd "../swig-%{swig_version}"
 CFLAGS="%{optflags}" \
@@ -397,6 +386,8 @@ CXXFLAGS="%{optflags}" \
 %__make %{?jobs:-j%{jobs}}
 %__make install
 popd #swig
+%endif
+
 with_jdk=none
 %if %with_java
 for i in \
@@ -466,10 +457,8 @@ do
 	echo
 done >> build-outputs.mK
 export CFLAGS="$(%{apxs} -q CFLAGS) -Wall -g"
-%if 0%{?suse_version} > 930
 CFLAGS="$CFLAGS -fpie"
 export LDFLAGS=-pie
-%endif # suse_version > 930
 %if 0%{?suse_version} > 1000
 CFLAGS="$CFLAGS -fstack-protector"
 %endif # suse_version > 1000
@@ -535,16 +524,9 @@ pushd tools/server-side
 for f in svn-populate-node-origins-index svnauthz-validate; do
     %__cc %{optflags} ${TOOLS_CFLAGS} ${TOOLS_LIBS} -o "${f}" "${f}.c"
 done
-%if 0%{?sles_version} == 9
-%__sed -i 's|^#![[:space:]]*/usr/bin/env[[:space:]]*python[[:space:]]|#!/usr/bin/python2.5|' *.py
-%endif
 popd #tools/server-side
 
 %install
-%if 0%{?sles_version} == 9
-export PATH="$PWD/BUILDPATH:$PATH"
-export PYTHON="%{_usr}/bin/python2.5"
-%endif
 if [ -f with_jdk ] ; then
 with_jdk=install-javahl
 else
@@ -648,9 +630,6 @@ rm -f %{buildroot}/var/adm/perl-modules/subversion
 # Don't run regression tests on Factory, they take too long to complete.
 # This check needs to be bumped with every release:
 %if 0%{?suse_version} <= 1110 
-%if 0%{?sles_version} == 9
-export PATH="$PWD/BUILDPATH:$PATH"
-%endif # sles_version == 9
 # During "make check", auth-test loads DSOs at runtime and can't find
 # them if we don't set up LD_LIBRARY_PATH as below.
 export LD_LIBRARY_PATH="$PWD/subversion/libsvn_auth_kwallet/.libs:$PWD/subversion/libsvn_auth_gnome_keyring/.libs:$LD_LIBRARY_PATH"