From 7bd112da30542f7e63f0ef4d5c56231f93dc1c50ed5d69139ab4bd1e9de6631b Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Sun, 23 Oct 2011 15:26:21 +0000
Subject: [PATCH] fixes

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

diff --git a/subversion.spec b/subversion.spec
index 4d56b7a..a91f444 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -20,7 +20,7 @@
 
 %define with_ruby          0%{?suse_version} > 1110
 %define with_intree_swig 0%{?suse_version} != 1110
-%if 0%{?always_use_intree_sqlite}
+%if 0%{?always_use_intree_sqlite:1}
 %define with_intree_sqlite 1
 %define with_python_ctypes 0%{?suse_version} > 1110
 %else
@@ -43,7 +43,7 @@ BuildRequires:  pkgconfig
 BuildRequires:  python-devel python-xml
 BuildRequires:  update-alternatives
 %if %with_python_ctypes
-#BuildRequires:  ctypesgen
+BuildRequires:  ctypesgen
 %endif
 %if %with_ruby
 BuildRequires:  ruby-devel
@@ -466,21 +466,6 @@ python_ctypes_target=ctypes-python
 python_ctypes_target=
 %endif # with_python_ctypes
 %__make swig-py $python_ctypes_target swig-pl $ruby_target SWIG_LDFLAGS= $with_jdk
-#
-# build additional tools
-TOOLS_LIBS=""
-for d in subversion/libsvn_*/.libs; do
-    TOOLS_LIBS="$TOOLS_LIBS -L${PWD}/$d"
-done
-TOOLS_LIBS="$TOOLS_LIBS $(pkg-config --libs apr-1 apr-util-1)"
-TOOLS_LIBS="$TOOLS_LIBS -lsvn_subr-1 -lsvn_fs-1 -lsvn_repos-1"
-TOOLS_CFLAGS=$(pkg-config --cflags apr-1 apr-util-1)
-TOOLS_CFLAGS="$TOOLS_CFLAGS -I$PWD/subversion/include"
-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
-popd #tools/server-side
 
 %install
 if [ -f with_jdk ] ; then
@@ -537,8 +522,8 @@ cat with_jdk.files >> files.subversion
 #
 # tools
 %__make DESTDIR="$RPM_BUILD_ROOT" install-tools
-# add svn-rep-sharing-stats,svnmucc for subversion 1.7!
-%__mv $RPM_BUILD_ROOT%{_bindir}/svn-tools/{svn-populate-node-origins-index,svnauthz-validate} $RPM_BUILD_ROOT%{_bindir}
+# add svn-rep-sharing-stats,svnmucc,svnauthz-validate for subversion 1.7!
+# %__mv $RPM_BUILD_ROOT%{_bindir}/svn-tools/{svn-populate-node-origins-index} $RPM_BUILD_ROOT%{_bindir}
 # discard all other tools
 %__rm -rf $RPM_BUILD_ROOT%{_bindir}/svn-tools
 #
@@ -553,9 +538,6 @@ install -m 644 -D %{S:10} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.svn
 install -m 644 -D %{S:12} $RPM_BUILD_ROOT/%{_fwdefdir}/svnserve
 #useless libtool stuff
 rm -f %{buildroot}%{_libdir}/*.la
-# delete or the binaries will also be installed under /usr/share
-%__rm "%{buildroot}%{_datadir}/subversion/tools/server-side"/{svn-populate-node-origins-index,svnauthz-validate}
-popd #tools/server-side
 if [ "$with_jdk" != "" ] ; then
     install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir}/java
     ln -sv %{_libdir}/svn-javahl/svn-javahl.jar $RPM_BUILD_ROOT/%{_datadir}/java/svn-javahl.jar
@@ -729,12 +711,10 @@ kill -9 `cat "$SVNSERVE_PIDFILE" 2>/dev/null`
 
 %files tools
 %defattr(-,root,root)
-%dir /usr/share/subversion
-/usr/share/subversion/tools
 %attr(755,root,root) %{_bindir}/svnmerge.py
 %attr(755,root,root) %{_bindir}/svn_apply_autoprops.py
-%{_bindir}/svn-populate-node-origins-index
-%{_bindir}/svnauthz-validate
+#%{_bindir}/svn-populate-node-origins-index
+#%{_bindir}/svnauthz-validate
 
 %files server
 %defattr(-,root,root)