OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/subversion?expand=0&rev=12

subversion-1.1.x-COMPILE_CXX.dif

@@ -1,16 +0,0 @@
- Makefile.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: subversion-1.4.x/Makefile.in
-===================================================================
---- subversion-1.4.x.orig/Makefile.in
-+++ subversion-1.4.x/Makefile.in
-@@ -140,7 +140,7 @@ CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS)
- LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS)
- 
- COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
--COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) $(INCLUDES)
-+COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES)
- LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
- 
- # special compilation for files destined for mod_dav_svn

subversion-1.4.x.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ba0d4745028d134469c5fdbbfaa27876372b6d7d86a20cb4e3ad6c71e6b3c746
-size 4026893

subversion-1.5.x.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b89e5ac43f07d1c2c6d9058a32e14fb4f3efd3a75e7dc6d8979ea301fcc7d71e
+size 8462943

subversion-neon-027.diff

@@ -1,30 +0,0 @@
---- build/ac-macros/neon.m4
-+++ build/ac-macros/neon.m4
-@@ -50,11 +50,11 @@ AC_DEFUN(SVN_LIB_NEON,
-       NEON_VERSION=`cat $abs_srcdir/neon/.version`
-       AC_MSG_RESULT([$NEON_VERSION])
- 
--      if test -n "`echo \"$NEON_VERSION\" | grep '^0\.2[[56]]\.'`" ; then
-+      if test -n "`echo \"$NEON_VERSION\" | grep '^0\.2[[56789]]\.'`" ; then
-         AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],
-                            [Define to 1 if you have Neon 0.25 or later.])
-       fi
--      if test -n "`echo \"$NEON_VERSION\" | grep '^0\.26\.'`" ; then
-+      if test -n "`echo \"$NEON_VERSION\" | grep '^0\.2[[6789]]\.'`" ; then
-         AC_DEFINE_UNQUOTED([SVN_NEON_0_26], [1],
-                            [Define to 1 if you have Neon 0.26 or later.])
-       fi
---- subversion/libsvn_ra_dav/ra_dav.h
-+++ subversion/libsvn_ra_dav/ra_dav.h
-@@ -21,6 +21,11 @@
- #ifndef SVN_LIBSVN_RA_DAV_H
- #define SVN_LIBSVN_RA_DAV_H
- 
-+#ifndef SVN_NEON_0_25
-+#define SVN_NEON_0_25 1
-+#define SVN_NEON_0_26 1 
-+#endif
-+
- #include <apr_pools.h>
- #include <apr_tables.h>
- 

subversion-swig-perl-install_vendor.patch

@@ -1,11 +1,9 @@
  Makefile.in |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: subversion-1.4.x/Makefile.in
+--- a/Makefile.in
-===================================================================
++++ b/Makefile.in
---- subversion-1.4.x.orig/Makefile.in
+@@ -652,7 +652,7 @@ check-swig-pl: swig-pl swig-pl-lib
-+++ subversion-1.4.x/Makefile.in
-@@ -616,7 +616,7 @@ check-swig-pl: swig-pl swig-pl-lib
  	cd $(SWIG_PL_DIR)/native; $(MAKE) test
  
  install-swig-pl: swig-pl install-swig-pl-lib

subversion.allowed-neon.patch

@@ -0,0 +1,17 @@
+---
+ configure.ac |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -69,8 +69,8 @@ SVN_LIB_APRUTIL($APU_VER_REGEXES)
+ 
+ # Either a space-separated list of allowable Neon versions, or "any" to
+ # mean allow anything.
+-NEON_ALLOWED_LIST="0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2 0.26.3 0.26.4 0.27.2"
+-NEON_RECOMMENDED_VER=0.25.5
++NEON_ALLOWED_LIST="0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2 0.26.3 0.26.4 0.27.0 0.27.1 0.27.2"
++NEON_RECOMMENDED_VER=0.27.0
+ NEON_URL="http://www.webdav.org/neon/neon-${NEON_RECOMMENDED_VER}.tar.gz"
+ dnl You can skip the neon version check only if you know what you are doing 
+ AC_ARG_ENABLE(neon-version-check,

subversion.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Oct 15 17:13:09 CEST 2007 - olh@suse.de
+
+- update to 1.5.x branch, to allow build with new neon
+  build also with sqlite-devel
+  disable javahl until build is fixed
+
 -------------------------------------------------------------------
 Mon Oct 15 16:38:15 CEST 2007 - dmueller@suse.de
 

subversion.java14.patch

@@ -1,41 +1,11 @@
 ---
- build/generator/gen_make.py                     |    2 +-
+ configure.ac                               |    2 +-
- build/generator/gen_win.py                      |    2 +-
+ subversion/bindings/javahl/build/build.xml |    4 ++--
- configure.in                                    |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
- subversion/bindings/java/javahl/build/build.xml |    4 ++--
- 4 files changed, 5 insertions(+), 5 deletions(-)
 
-Index: subversion-1.4.x/build/generator/gen_make.py
+--- a/configure.ac
-===================================================================
++++ b/configure.ac
---- subversion-1.4.x.orig/build/generator/gen_make.py
+@@ -565,7 +565,7 @@ fi
-+++ subversion-1.4.x/build/generator/gen_make.py
-@@ -292,7 +292,7 @@ class Generator(gen_base.GeneratorBase):
-           self.ofile.write(
-             '%s_SRC = %s\n'
-             '$(%s_OBJECTS): $(%s_SRC)\n'
--            '\t%s -d %s -classpath %s:$(%s_CLASSPATH) $(%s_SRC)\n'
-+            '\t%s -source 1.4 -target 1.4 -d %s -classpath %s:$(%s_CLASSPATH) $(%s_SRC)\n'
-             % (targ_varname, string.join(object_srcs),
- 
-                targ_varname, targ_varname,
-Index: subversion-1.4.x/build/generator/gen_win.py
-===================================================================
---- subversion-1.4.x.orig/build/generator/gen_win.py
-+++ subversion-1.4.x/build/generator/gen_win.py
-@@ -315,7 +315,7 @@ class WinGeneratorBase(GeneratorBase):
- 
-           sourcepath = self.path(source.sourcepath)
- 
--          cbuild = "javac -g -target 1.2 -source 1.3 -classpath %s -d %s " \
-+          cbuild = "javac -g -target 1.4 -source 1.4 -classpath %s -d %s " \
-                    "-sourcepath %s $(InputPath)" \
-                    % tuple(map(self.quote, (classes, targetdir, sourcepath)))
- 
-Index: subversion-1.4.x/configure.in
-===================================================================
---- subversion-1.4.x.orig/configure.in
-+++ subversion-1.4.x/configure.in
-@@ -552,7 +552,7 @@ fi
  AC_PATH_PROGS(PYTHON, "$PYTHON", none)
  
  # The minimum version for the JVM runtime for our Java bytecode.
@@ -44,21 +14,21 @@ Index: subversion-1.4.x/configure.in
  # SVN_CHECK_JDK sets $JAVA_CLASSPATH
  SVN_CHECK_JDK($JAVA_OLDEST_WORKING_VER)
  
-Index: subversion-1.4.x/subversion/bindings/java/javahl/build/build.xml
+--- a/subversion/bindings/javahl/build/build.xml
-===================================================================
++++ b/subversion/bindings/javahl/build/build.xml
---- subversion-1.4.x.orig/subversion/bindings/java/javahl/build/build.xml
+@@ -21,7 +21,7 @@
-+++ subversion-1.4.x/subversion/bindings/java/javahl/build/build.xml
+ 
-@@ -17,13 +17,13 @@
+     <target name="compile" unless="junit.path"
-         </javah>
+             description="Compile the Java binding source files">
-     </target>
-     <target name="javac" unless="junit.path">
 -        <javac compiler="modern" destdir="classes">
 +        <javac source="1.4" target="1.4" destdir="classes">
              <src path="src"/>
              <exclude name="org/tigris/subversion/javahl/tests/**"/>
          </javac>
-     </target>
+@@ -29,7 +29,7 @@
-     <target name="javac-tests" if="junit.path">
+ 
+     <target name="compile-tests" if="junit.path"
+             description="Compile the Java test source files">
 -        <javac compiler="modern" destdir="classes">
 +        <javac source="1.4" target="1.4" destdir="classes">
              <src path="src"/>

subversion.libtool-pie-flags.patch

@@ -1,40 +1,40 @@
- Makefile.in |   15 ++++++++-------
+ Makefile.in |   17 ++++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
+ 1 file changed, 10 insertions(+), 7 deletions(-)
 
-Index: subversion-1.4.x/Makefile.in
+--- a/Makefile.in
-===================================================================
++++ b/Makefile.in
---- subversion-1.4.x.orig/Makefile.in
+@@ -150,24 +150,27 @@ CXXFLAGS = @CXXFLAGS@ $(EXTRA_CXXFLAGS)
-+++ subversion-1.4.x/Makefile.in
-@@ -139,24 +139,25 @@ CFLAGS = @CFLAGS@ $(EXTRA_CFLAGS)
  CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS)
  LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS)
  
-+PIEFLAGS = -fno-pie -fno-PIE
++NOPIECFLAGS = -fno-pie -fno-PIE
++PIECFLAGS = -fpie -fPIE
++PIELDFLAGS = -pie
  COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
  COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES)
 -LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
-+LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) $(PIEFLAGS)
++LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) $(NOPIECFLAGS)
  
  # special compilation for files destined for mod_dav_svn
 -COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c
-+COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(PIEFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c
++COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(NOPIECFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c
  
  # special compilation for files destined for libsvn_swig_* (e.g. swigutil_*.c)
 -COMPILE_SWIG_PY = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) -DSWIGPYTHON $(CFLAGS) $(SWIG_PY_INCLUDES) $(INCLUDES) -o $@ -c
 -COMPILE_SWIG_PL = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(SWIG_PL_INCLUDES) $(INCLUDES) -o $@ -c
 -COMPILE_SWIG_RB = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(CPPFLAGS) $(CFLAGS) $(SWIG_RB_INCLUDES) $(INCLUDES) -o $@ -c
-+COMPILE_SWIG_PY = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) -DSWIGPYTHON $(CFLAGS) $(PIEFLAGS) $(SWIG_PY_INCLUDES) $(INCLUDES) -o $@ -c
++COMPILE_SWIG_PY = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) -DSWIGPYTHON $(CFLAGS) $(NOPIECFLAGS) $(SWIG_PY_INCLUDES) $(INCLUDES) -o $@ -c
-+COMPILE_SWIG_PL = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(PIEFLAGS) $(SWIG_PL_INCLUDES) $(INCLUDES) -o $@ -c
++COMPILE_SWIG_PL = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(NOPIECFLAGS) $(SWIG_PL_INCLUDES) $(INCLUDES) -o $@ -c
-+COMPILE_SWIG_RB = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(CPPFLAGS) $(CFLAGS) $(PIEFLAGS) $(SWIG_RB_INCLUDES) $(INCLUDES) -o $@ -c
++COMPILE_SWIG_RB = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(CPPFLAGS) $(CFLAGS) $(NOPIECFLAGS) $(SWIG_RB_INCLUDES) $(INCLUDES) -o $@ -c
  
  # special compilation for files destined for javahl (i.e. C++)
 -COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(JAVAHL_INCLUDES) -o $@ -c
-+COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(PIEFLAGS) $(JAVAHL_INCLUDES) -o $@ -c
++COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(NOPIECFLAGS) $(JAVAHL_INCLUDES) -o $@ -c
  COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
  COMPILE_JAVAHL_JAVAH = $(JAVAH)
  
 -LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
-+LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) $(PIEFLAGS) -rpath $(libdir)
++LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) $(PIELDFLAGS) -rpath $(libdir)
  
  # special link rule for mod_dav_svn
  LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)

subversion.libtool-verbose.patch

@@ -1,11 +1,9 @@
  Makefile.in |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: subversion-1.4.x/Makefile.in
+--- a/Makefile.in
-===================================================================
++++ b/Makefile.in
---- subversion-1.4.x.orig/Makefile.in
+@@ -95,8 +95,8 @@ EXEEXT = @EXEEXT@
-+++ subversion-1.4.x/Makefile.in
-@@ -90,8 +90,8 @@ EXEEXT = @EXEEXT@
  
  SHELL = @SHELL@
  LIBTOOL = @SVN_LIBTOOL@

subversion.props.state_pos.patch

@@ -0,0 +1,35 @@
+subversion/libsvn_wc/props.c: In function 'svn_wc__merge_props':
+subversion/libsvn_wc/props.c:1166: warning: 'state_pos' is used uninitialized in this function
+subversion/libsvn_wc/props.c:1145: note: 'state_pos' was declared here
+subversion/libsvn_wc/props.c:1166: warning: 'state_pos' is used uninitialized in this function
+subversion/libsvn_wc/props.c:1145: note: 'state_pos' was declared here
+subversion/libsvn_wc/props.c:1166: warning: 'state_pos' is used uninitialized in this function
+subversion/libsvn_wc/props.c:1145: note: 'state_pos' was declared here
+subversion/libsvn_wc/props.c:1166: warning: 'state_pos' is used uninitialized in this function
+subversion/libsvn_wc/props.c:1145: note: 'state_pos' was declared here
+subversion/libsvn_wc/props.c:1166: warning: 'state_pos' is used uninitialized in this function
+subversion/libsvn_wc/props.c:1145: note: 'state_pos' was declared here
+subversion/libsvn_wc/props.c:1166: warning: 'state_pos' is used uninitialized in this function
+subversion/libsvn_wc/props.c:1145: note: 'state_pos' was declared here
+subversion/libsvn_wc/props.c:1166: warning: 'state_pos' is used uninitialized in this function
+subversion/libsvn_wc/props.c:1145: note: 'state_pos' was declared here
+subversion/libsvn_wc/props.c:1166: warning: 'state_pos' is used uninitialized in this function
+subversion/libsvn_wc/props.c:1145: note: 'state_pos' was declared here
+subversion/libsvn_wc/props.c:1166: warning: 'state_pos' is used uninitialized in this function
+subversion/libsvn_wc/props.c:1145: note: 'state_pos' was declared here
+
+---
+ subversion/libsvn_wc/props.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/subversion/libsvn_wc/props.c
++++ b/subversion/libsvn_wc/props.c
+@@ -1142,7 +1142,7 @@ set_prop_merge_state(svn_wc_notify_state
+       svn_wc_notify_state_merged,
+       svn_wc_notify_state_obstructed,
+       svn_wc_notify_state_conflicted };
+-  int state_pos, i;
++  int state_pos = 0, i;
+ 
+   if (! state)
+     return;

subversion.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package subversion (Version 1.4.5)
+# spec file for package subversion (Version 1.5.0)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -12,7 +12,8 @@
 
 Name:           subversion
 BuildRequires:  apache2-devel db-devel gcc-c++ java2-devel-packages libneon-devel openldap2-devel python-devel swig
-Version:        1.4.5
+BuildRequires:  sqlite-devel
+Version:        1.5.0
 Release:        1
 #
 %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
@@ -30,7 +31,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 License:        Subversion license, http://subversion.tigris.org/license-1.html
 Group:          Development/Tools/Version Control
 Url:            http://subversion.tigris.org
-Source0:        subversion-1.4.x.tar.bz2
+Source0:        subversion-1.5.x.tar.bz2
 Source1:        subversion.conf
 Source2:        subversion.README.SuSE
 Source9:        subversion.rcsvnserve
@@ -41,16 +42,15 @@ Source42:       subversion.svngrep.sh
 Source43:       subversion.svndiff.sh
 #
 Patch11:        subversion.libtool-verbose.patch
-Patch12:        subversion.svn_swig_pl_info_receiver.patch
+Patch12:        subversion.props.state_pos.patch
 # build fixes
 Patch20:        subversion-swig-perl-install_vendor.patch
-Patch22:        subversion-1.1.x-COMPILE_CXX.dif
 Patch23:        subversion.libtool-pie-flags.patch
 Patch24:        subversion.svn_swig_perl.dep.patch
 Patch31:        subversion.perl.LD_RUN_PATH.patch
 Patch32:        subversion.fallback-to-ipv4.patch
 Patch33:        subversion.header_wrappers.patch
-Patch34:        subversion-neon-027.diff
+Patch34:        subversion.allowed-neon.patch
 Patch35:        subversion.java14.patch
 #
 
@@ -124,17 +124,12 @@ case "$swig" in
 		exit 1
 		;;
 esac
-%setup -q -n subversion-1.4.x
+%setup -q -n subversion-1.5.x
-#
-# warning: no newline at end of file
-echo "" >> subversion/bindings/java/javahl/native/Path.cpp
-echo "" >> subversion/bindings/java/javahl/native/Targets.cpp
 #
 %patch11 -p1
 %patch12 -p1
 #
 %patch20 -p1
-%patch22 -p1
 %if 0%{?suse_version} > 930
 %patch23 -p1
 %endif
@@ -142,7 +137,7 @@ echo "" >> subversion/bindings/java/javahl/native/Targets.cpp
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
-%patch34
+%patch34 -p1
 %patch35 -p1
 
 %build
@@ -168,6 +163,7 @@ with_jdk="$i"
 break
 fi
 done
+with_jdk=none
 if [ "$with_jdk" != "none" ] ; then
 with_jdk="--with-jdk=$with_jdk --enable-javahl"
 echo with_jdk > with_jdk
@@ -198,9 +194,9 @@ s@^swig_pydir_extra = .*@swig_pydir_extra = %{site_python}/svn@
 " < Makefile.in. > Makefile.in
 diff -u Makefile.in. Makefile.in || true
 sh -x autogen.sh
-for i in subversion/bindings/java/javahl/native/*.cpp
+for i in subversion/bindings/javahl/native/*.cpp
 do
-	d=$(sed -n '/^#include "..\/include/{s@^[^/]\+\([^"]\+\).*@subversion/bindings/java/javahl\1@;H};${x;s@\n@ @gp}' $i)
+	d=$(sed -n '/^#include "..\/include/{s@^[^/]\+\([^"]\+\).*@subversion/bindings/javahl\1@;H};${x;s@\n@ @gp}' $i)
 	echo
 	echo "# $i"
 	if ! test -z "$d"
@@ -208,7 +204,7 @@ do
 		echo ${i%.cpp}.lo: $d
 	fi
 	echo
-done >> build-outputs.mk
+done >> build-outputs.mK
 export CFLAGS="$(%{apxs} -q CFLAGS) -Wall -g"
 %if 0%{?suse_version} > 930
 CFLAGS="$CFLAGS -fpie"
@@ -228,11 +224,10 @@ export CXXFLAGS="$CFLAGS"
 	--with-apr=%{_prefix} \
 	--with-apr-util=%{_prefix} \
 	--with-apxs=%{apxs} \
-	--with-zlib \
+	--with-zlib=%{_prefix} \
 	$with_jdk \
 	--with-jikes=no \
 	--enable-swig-bindings \
-        --disable-neon-version-check \
 	--disable-mod-activation
 make %{?jobs:-j%jobs}
 #
@@ -243,7 +238,6 @@ make swig-py swig-pl $with_jdk %{?jobs:-j%jobs}
 #
 
 %install
-rm -rf $RPM_BUILD_ROOT
 if [ -f with_jdk ] ; then
 with_jdk=install-javahl
 else
@@ -267,9 +261,9 @@ cp -Lav %{S:42} $RPM_BUILD_ROOT/usr/bin/svngrep
 cp -Lav %{S:43} $RPM_BUILD_ROOT/usr/bin/svndiff
 #
 mkdir -p $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/
-cp -avL contrib/client-side/psvn/*.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/
+cp -avL contrib/client-side/emacs/*.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/
 #
-cp -avL contrib/client-side/svnmerge.py $RPM_BUILD_ROOT/usr/bin
+cp -avL contrib/client-side/svnmerge/svnmerge.py $RPM_BUILD_ROOT/usr/bin
 #
 mkdir -p $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d
 cp -av %{S:1} $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d/subversion.conf
@@ -284,9 +278,9 @@ mkdir -p   $RPM_BUILD_ROOT/usr/share/subversion/
 cp -a tools $RPM_BUILD_ROOT/usr/share/subversion/
 #m -rf $RPM_BUILD_ROOT/usr/share/subversion/tools/cvs2svn
 mkdir $RPM_BUILD_ROOT/usr/share/subversion/tools/svn_load_dirs
-cp -aL contrib/client-side/svn_load_dirs.README $RPM_BUILD_ROOT/usr/share/subversion/tools/svn_load_dirs/README
+cp -aL contrib/client-side/svn_load_dirs/svn_load_dirs.README $RPM_BUILD_ROOT/usr/share/subversion/tools/svn_load_dirs/README
-cp -aL contrib/client-side/svn_load_dirs_property_table.example $RPM_BUILD_ROOT/usr/share/subversion/tools/svn_load_dirs/
+cp -aL contrib/client-side/svn_load_dirs/svn_load_dirs_property_table.example $RPM_BUILD_ROOT/usr/share/subversion/tools/svn_load_dirs/
-sed 's:@SVN_BINDIR@:/usr:' contrib/client-side/svn_load_dirs.pl.in > $RPM_BUILD_ROOT/usr/share/subversion/tools/svn_load_dirs/svn_load_dirs.pl
+sed 's:@SVN_BINDIR@:/usr:' contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in > $RPM_BUILD_ROOT/usr/share/subversion/tools/svn_load_dirs/svn_load_dirs.pl
 chmod 755 $RPM_BUILD_ROOT/usr/share/subversion/tools/svn_load_dirs/svn_load_dirs.pl
 find $RPM_BUILD_ROOT \( -name .svn -o -name CVS -o -name tests \) -type d -print0 | xargs -0 rm -rfv
 find $RPM_BUILD_ROOT \( -name "*.a" -o -name "*.c" \) -type f -print0 | xargs -0 rm -rfv
@@ -395,6 +389,10 @@ rm -rf $RPM_BUILD_ROOT
 %{apache_libexecdir}/mod_dav_svn.*
 %{apache_libexecdir}/mod_authz_svn.*
 %changelog
+* Mon Oct 15 2007 - olh@suse.de
+- update to 1.5.x branch, to allow build with new neon
+  build also with sqlite-devel
+  disable javahl until build is fixed
 * Mon Oct 15 2007 - dmueller@suse.de
 - update to 1.4.5:
   * Security fix (for w32 only)

subversion.svn_swig_pl_info_receiver.patch

@@ -1,19 +0,0 @@
-/usr/src/packages/BUILD/subversion-1.4.x/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c:1134: warning: 'return' with no value, in function returning non-void
-
----
- subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: subversion-1.4.x/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
-===================================================================
---- subversion-1.4.x.orig/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
-+++ subversion-1.4.x/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
-@@ -1132,7 +1132,7 @@ svn_error_t *svn_swig_pl_info_receiver(v
-     swig_type_info *infoinfo = _SWIG_TYPE("svn_info_t *");
- 
-     if (!SvOK((SV *)baton))
--        return;
-+        return SVN_NO_ERROR;
-    
-     svn_swig_pl_callback_thunk(CALL_SV, baton, &result, "sSS", path, info,
-                                infoinfo, pool, POOLINFO);