From fd5a89f4ec5d66e977af4f1e2a8ca2850886417d1245f643449699069568b195 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 9 Jun 2009 15:49:58 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/subversion?expand=0&rev=54 --- gcc-warnings.diff | 10 - rpmlintrc | 1 + sqlite-amalgamation-3.6.14.2.tar.bz2 | 3 + subversion-1.6.1.tar.bz2 | 3 - subversion-1.6.2.tar.bz2 | 3 + subversion-ctypes-remove_shebang.patch | 8 + ...-fix_nonvoid_function_without_return.patch | 10 + subversion.allowed-neon.patch | 11 + subversion.changes | 149 +++++ subversion.libtool-pie-flags.patch | 47 +- subversion.libtool-verbose.patch | 9 +- subversion.spec | 534 ++++++++++++++++-- swig-1.3.36.tar.bz2 | 3 + 13 files changed, 719 insertions(+), 72 deletions(-) delete mode 100644 gcc-warnings.diff create mode 100644 rpmlintrc create mode 100644 sqlite-amalgamation-3.6.14.2.tar.bz2 delete mode 100644 subversion-1.6.1.tar.bz2 create mode 100644 subversion-1.6.2.tar.bz2 create mode 100644 subversion-ctypes-remove_shebang.patch create mode 100644 subversion-fix_nonvoid_function_without_return.patch create mode 100644 subversion.allowed-neon.patch create mode 100644 swig-1.3.36.tar.bz2 diff --git a/gcc-warnings.diff b/gcc-warnings.diff deleted file mode 100644 index 5d08f97..0000000 --- a/gcc-warnings.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- subversion/bindings/javahl/native/EnumMapper.cpp -+++ subversion/bindings/javahl/native/EnumMapper.cpp -@@ -496,6 +496,7 @@ jint EnumMapper::mapOperation(svn_wc_operation_t operation) - { - switch (operation) - { -+ default: - case svn_wc_operation_none: - return org_tigris_subversion_javahl_Operation_none; - case svn_wc_operation_update: diff --git a/rpmlintrc b/rpmlintrc new file mode 100644 index 0000000..47ff962 --- /dev/null +++ b/rpmlintrc @@ -0,0 +1 @@ +setBadness('shlib-policy-name-error', 0) diff --git a/sqlite-amalgamation-3.6.14.2.tar.bz2 b/sqlite-amalgamation-3.6.14.2.tar.bz2 new file mode 100644 index 0000000..7f13cb9 --- /dev/null +++ b/sqlite-amalgamation-3.6.14.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:03c17c48ec2936eb58abe5c7148e4a6368b47e92df8310d32efb75f5eb0064f1 +size 996539 diff --git a/subversion-1.6.1.tar.bz2 b/subversion-1.6.1.tar.bz2 deleted file mode 100644 index eaea6ef..0000000 --- a/subversion-1.6.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cdd4a7a4e2c6e67967b99fe7857a409b2ff5e57126214fdc0f6d835ff789e6ca -size 5462507 diff --git a/subversion-1.6.2.tar.bz2 b/subversion-1.6.2.tar.bz2 new file mode 100644 index 0000000..b1de955 --- /dev/null +++ b/subversion-1.6.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9788a5a19d032b7711b54f462f40b72ee0c6180069335db6994d96b7b23c4075 +size 5470969 diff --git a/subversion-ctypes-remove_shebang.patch b/subversion-ctypes-remove_shebang.patch new file mode 100644 index 0000000..8643912 --- /dev/null +++ b/subversion-ctypes-remove_shebang.patch @@ -0,0 +1,8 @@ +--- subversion/bindings/ctypes-python/csvn/core/__init__.py.orig 2009-03-30 15:16:52.000000000 +0200 ++++ subversion/bindings/ctypes-python/csvn/core/__init__.py 2009-03-30 15:17:11.000000000 +0200 +@@ -1,5 +1,3 @@ +-#!/home/djames/bin/python +- + from ctypes import * + import functions + from functions import * diff --git a/subversion-fix_nonvoid_function_without_return.patch b/subversion-fix_nonvoid_function_without_return.patch new file mode 100644 index 0000000..2b39dd9 --- /dev/null +++ b/subversion-fix_nonvoid_function_without_return.patch @@ -0,0 +1,10 @@ +--- subversion/bindings/javahl/native/EnumMapper.cpp.orig 2009-04-30 01:40:36.000000000 +0200 ++++ subversion/bindings/javahl/native/EnumMapper.cpp 2009-04-30 01:40:50.000000000 +0200 +@@ -497,6 +497,7 @@ + switch (operation) + { + case svn_wc_operation_none: ++ default: + return org_tigris_subversion_javahl_Operation_none; + case svn_wc_operation_update: + return org_tigris_subversion_javahl_Operation_update; diff --git a/subversion.allowed-neon.patch b/subversion.allowed-neon.patch new file mode 100644 index 0000000..6433ab9 --- /dev/null +++ b/subversion.allowed-neon.patch @@ -0,0 +1,11 @@ +--- configure.ac.orig 2009-04-10 14:08:35.000000000 +0200 ++++ configure.ac 2009-04-10 14:08:47.000000000 +0200 +@@ -79,7 +79,7 @@ + + # Either a space-separated list of allowable Neon versions, or "any" to + # mean allow anything. +-NEON_ALLOWED_LIST="0\.25 0\.26 0\.27\.2 0\.28" ++NEON_ALLOWED_LIST="any" + NEON_RECOMMENDED_VER=0.28.4 + 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 diff --git a/subversion.changes b/subversion.changes index 2beaec3..bf3cfce 100644 --- a/subversion.changes +++ b/subversion.changes @@ -1,3 +1,66 @@ +------------------------------------------------------------------- +Wed Jun 3 18:30:11 CEST 2009 - dmueller@suse.de + +- merge into Factory + +------------------------------------------------------------------- +Tue May 26 20:30:34 CEST 2009 - pascal.bleser@opensuse.org + +- update to sqlite-amalgamation 3.6.14.2 + +------------------------------------------------------------------- +Fri May 15 16:19:19 CEST 2009 - pascal.bleser@opensuse.org + +- enable in-tree sqlite-amalgamation again, as the required sqlite3 + package screws up zypper (bnc#504251) + +------------------------------------------------------------------- +Mon May 11 20:00:55 CEST 2009 - pascal.bleser@opensuse.org + +- bump in-tree sqlite-amalgamation to the recommended version for + Subversion 1.6.2: 3.6.13 + +- update to 1.6.2: + * vastly improve memory usage with 'svn merge' (issue #3393) + * make default depth for merge 'infinity' (r37156) + * make 'status --quiet' show tree conflicts (issue #3396) + * allow '--set-depth infinity' to expand shallow subtrees + (r37169) + * return an error if attempting to reintegrate from/to the repo + root (r37385) + * don't store bogus mergeinfo for '--ignore-ancestry', foreign + merges (r37333) + * don't allow merge of difference between two repos (r37519) + * avoid potential segfault with subtree mergeinfo (r36613) + * recommend sqlite 3.6.13 (r37245) + * avoid unnecessary server query for implicit mergeinfo + (r36509) + * avoid unnecessary server query during reverse merges (r36527) + * set depth=infinity on 'svn add' items with restricted depth + (r37607) + * fixed: commit log message template missing paths (issue #3399) + * fixed: segfault on merge with servers < 1.6 (r37363) + * fixed: repeat merge failures with non-inheritable mergeinfo + (issue #3392) + * fixed: another memory leak when performing mergeinfo-aware + merges (r37398) + * fixed: incorrect mergeinfo on children of shallow merges + (issue #3407) + * fixed: pool lifetime issues in the BDB backend (r37137) + +------------------------------------------------------------------- +Thu May 7 23:46:00 CEST 2009 - pascal.bleser@opensuse.org + +- build and install the following binaries from tools/server-side + into subversion-tools: + * svn-populate-node-origins-index + * svnauthz-validate + +- add support for building Subversion 1.6.x on SLE 9, by using the + package "python25" and patching all python scripts accordingly, + to use #!/usr/bin/python2.5 instead of /usr/bin/python or + /usr/bin/env python + ------------------------------------------------------------------- Wed Apr 15 11:25:47 CEST 2009 - dmueller@suse.de @@ -39,6 +102,92 @@ Wed Apr 15 11:25:47 CEST 2009 - dmueller@suse.de * fixed: warning with Python 2.6 and ctypes bindings (r36559) * fixed: undefined references to svn_fs_path_change2_create() (r36823) +------------------------------------------------------------------- +Mon Mar 30 23:40:22 CEST 2009 - pascal.bleser@opensuse.org + +- fix build on SLE10 +- don't build on SLE9, its python is too old (requires >= 2.4) +- build gnome-keyring and kde4 kwallet authentication store plugins + as subpackages +- added explicit BuildRequires for cyrus-sasl-devel +- use an in-tree sqlite 3.6.11 as recommended instead of the + system-wide version +- removed the %changelog from the spec file, was very long, and we + have a .changes file anyway +- rpmlint happiness: + * added a patch to remove a pointless shebang in the python + bindings + * removed dot at end of Summary in subpackages +- removed the License: tag in each subpackage + +------------------------------------------------------------------- +Sun Mar 22 23:30:28 CET 2009 - pascal.bleser@opensuse.org + +- build the new ctypes python bindings +- upgraded in-tree SWIG to the recommended version for building + SVN: 1.3.36 (required to build the Ruby bindings) +- 1.6.0 in a separate repository for now +- update to 1.6.0: + * the working copy format has been upgraded: this means that 1.5 + and older Subversion clients will not be able to work with + working copies produced by Subversion 1.6; working copies are + upgraded automatically + * the repository filesystem formats have changed, meaning that + 1.5 and older versions of Subversion tools that normally access + a repository directly (e.g. svnserve, mod_dav_svn, svnadmin) + won't be able to read a repository created by Subversion 1.6; + but, repositories are not upgraded automatically (use + "svnadmin upgrade") + * improved output of "svn proplist --verbose" + * "svn propget" now accepts the --verbose option + * changed output of "svn status": now contains the additional + seventh column which informs whether the item is the victim of a + tree conflict; an additional line with more detailed description + of a tree conflict is displayed after each item remaining in tree + conflict + * subversion prompts before storing passwords in plaintext form + * passwords can be stored in KWallet (KDE 4) and GNOME Keyring + * SSL client certificate passphrases can be stored in KWallet, + GNOME Keyring in encrypted form or in plaintext form + * repository root relative URLs (client) + * improvements to "svn:externals": support for files and usual shell + quoting rules in external definitions + * detection of tree conflicts: Subversion 1.6 recognizes a new kind + of conflict, known as a "tree conflict"; such conflicts manifest + at the level of directory structure, rather than file content + * several improvements to both the Berkeley DB and FSFS backends, + designed to improve storage space, and can result in drastically + smaller repositories: + + sharing multiple common representations + + FSFS repositories: packing completed shards + + FSFS repositories: support for Memcached + + BDB repositories: reverse deltas + * ctypes Python bindings + * improved interactive conflict resolution + * sparse directory exclusion + * logging support for svnserve + * new public "historical" HTTP URI syntax for mod_dav_svn + * the "svn log" command can now take multiple revision arguments in + one invocation + * --trust-server-cert option: added to svn and svnsync, so that + non-interactive operations can work with self-signed certificates + not backed by a known trust authority + +------------------------------------------------------------------- +Sun Mar 8 23:29:34 CET 2009 - pascal.bleser@opensuse.org + +- enable build of ruby bindings by using an in-tree SWIG 1.3.33 +- update to 1.5.6: + * allow colons within mergeinfo path names (r35040) + * make it impossible to add .svn to wc via 'svn add --parents' + (r35143, -5) + * copy properties of added but uncommitted files (r32448) + * improve performance of log operation on < 1.5 servers (r35566) + * allow commits over Neon of files >2GB (POSIX only) (r34919, -24) + * allow serf from behind MS ISA proxy servers (r35981) + * prevent svnmerge-migrate-history.py from committing bogus + mergeinfo (r35516) + ------------------------------------------------------------------- Wed Feb 18 00:49:55 CET 2009 - crrodriguez@suse.de diff --git a/subversion.libtool-pie-flags.patch b/subversion.libtool-pie-flags.patch index a3db637..564b396 100644 --- a/subversion.libtool-pie-flags.patch +++ b/subversion.libtool-pie-flags.patch @@ -1,11 +1,8 @@ - Makefile.in | 17 ++++++++++------- - 1 file changed, 10 insertions(+), 7 deletions(-) - ---- a/Makefile.in -+++ b/Makefile.in -@@ -150,24 +150,27 @@ CXXFLAGS = @CXXFLAGS@ $(EXTRA_CXXFLAGS) - CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS) +--- Makefile.in.orig 2009-03-21 11:01:46.000000000 +0100 ++++ Makefile.in 2009-03-21 11:06:08.000000000 +0100 +@@ -163,42 +163,45 @@ LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS) + SWIG_LDFLAGS = @SWIG_LDFLAGS@ $(EXTRA_SWIG_LDFLAGS) +NOPIECFLAGS = -fno-pie -fno-PIE +PIECFLAGS = -fpie -fPIE @@ -13,19 +10,24 @@ COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) -LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) +-LT_COMPILE_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) +LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) $(NOPIECFLAGS) ++LT_COMPILE_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(NOPIECFLAGS) + + # Execute a command that loads libraries from the build dir + LT_EXECUTE = $(LIBTOOL) $(LTFLAGS) --mode=execute `for f in $(abs_builddir)/subversion/*/*.la; do echo -dlopen $$f; done` # 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) $(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_PY = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) -DSWIGPYTHON $(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) $(NOPIECFLAGS) $(SWIG_PY_INCLUDES) $(INCLUDES) -o $@ -c +-COMPILE_SWIG_RB = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(CPPFLAGS) $(SWIG_RB_INCLUDES) $(INCLUDES) -o $@ -c ++COMPILE_SWIG_PY = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) -DSWIGPYTHON $(NOPIECFLAGS) $(SWIG_PY_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) $(NOPIECFLAGS) $(SWIG_RB_INCLUDES) $(INCLUDES) -o $@ -c ++COMPILE_SWIG_RB = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(CPPFLAGS) $(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 @@ -34,7 +36,28 @@ COMPILE_JAVAHL_JAVAH = $(JAVAH) -LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) +-LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir) +LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) $(PIELDFLAGS) -rpath $(libdir) ++LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(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) +-LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) ++LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) $(PIELDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) + + # Compilation of SWIG-generated C source code +-COMPILE_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) $(SWIG_PY_INCLUDES) -prefer-pic -c -o $@ +-COMPILE_RB_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(CPPFLAGS) $(SWIG_RB_INCLUDES) -prefer-pic -c -o $@ ++COMPILE_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) $(PIECFLAGS) $(SWIG_PY_INCLUDES) -prefer-pic -c -o $@ ++COMPILE_RB_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(CPPFLAGS) $(PIECFLAGS) $(SWIG_RB_INCLUDES) -prefer-pic -c -o $@ + + # these commands link the wrapper objects into an extension library/module +-LINK_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_PY_LINK) $(SWIG_LDFLAGS) -rpath $(swig_pydir) -avoid-version -module +-LINK_RB_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_RB_LINK) $(SWIG_LDFLAGS) -rpath $(swig_rbdir) -avoid-version -module ++LINK_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_PY_LINK) $(PIELDFLAGS) $(SWIG_LDFLAGS) -rpath $(swig_pydir) -avoid-version -module ++LINK_RB_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_RB_LINK) $(PIELDFLAGS) $(SWIG_LDFLAGS) -rpath $(swig_rbdir) -avoid-version -module + +-LINK_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) $(LT_CXX_LIBADD) -rpath $(libdir) ++LINK_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) $(LT_CXX_LIBADD) $(PIELDFLAGS) -rpath $(libdir) + + INSTALL = @INSTALL@ + INSTALL_LIB = $(LIBTOOL) --mode=install $(INSTALL) diff --git a/subversion.libtool-verbose.patch b/subversion.libtool-verbose.patch index 0b2662b..0a71eb8 100644 --- a/subversion.libtool-verbose.patch +++ b/subversion.libtool-verbose.patch @@ -1,9 +1,6 @@ - Makefile.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/Makefile.in -+++ b/Makefile.in -@@ -95,8 +95,8 @@ EXEEXT = @EXEEXT@ +--- Makefile.in.orig 2009-03-21 11:08:29.000000000 +0100 ++++ Makefile.in 2009-03-21 11:08:46.000000000 +0100 +@@ -103,8 +103,8 @@ SHELL = @SHELL@ LIBTOOL = @SVN_LIBTOOL@ diff --git a/subversion.spec b/subversion.spec index 8e4d1f5..36e270e 100644 --- a/subversion.spec +++ b/subversion.spec @@ -1,7 +1,8 @@ # -# spec file for package subversion (Version 1.6.1) +# spec file for package subversion (Version 1.6.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 Pascal Bleser # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,28 +18,101 @@ # 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 +%define with_ruby 1 +%define with_python_ctypes 1 +%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 Name: subversion +Version: 1.6.2 +Release: 1 +# in-tree SWIG version to use for the build: +%define swig_version 1.3.36 +%define sqlite_version 3.6.14.2 %if 0%{?suse_version} > 910 BuildRequires: update-alternatives +%endif # suse_version > 910 +BuildRequires: apache2-devel db-devel gcc gcc-c++ glibc-devel libstdc++-devel zlib-devel +BuildRequires: pkgconfig +%if 0%{?sles_version} == 9 +BuildRequires: python25 python25-devel +%else +BuildRequires: python-devel %endif -BuildRequires: apache2-devel db-devel gcc-c++ java-devel python-devel swig zlib-devel +%if %with_python_ctypes +BuildRequires: ctypesgen +%endif # with_python_ctypes +%if %with_ruby +BuildRequires: ruby-devel +%endif # with_ruby +BuildRequires: apache2-prefork +BuildRequires: cyrus-sasl-devel +%if %with_gnome_keyring +BuildRequires: dbus-1-devel +BuildRequires: glib2-devel gnome-keyring-devel +%endif # with_gnome_keyring +%if %with_kde4_kwallet +BuildRequires: dbus-1-devel +BuildRequires: kdelibs4-core libkde4-devel libqt4-devel +%endif # with_kde4_kwallet +%ifarch ppc ppc64 +# no JDK on ppc +%define with_java 0 +%else +%if 0%{?sles_version} +# no JDK on SLE either +%define with_java 0 +%else +# JDK is available on the other targets +%define with_java 1 +# as the "java-devel" provides is mostly broken, we have to do some +# if wrestling to pick the appropriate JDK: +%if 0%{?suse_version} > 1110 +BuildRequires: java-1_6_0-openjdk-devel +%else +%if 0%{?suse_version} > 1030 +BuildRequires: java-1_6_0-sun-devel +%else +BuildRequires: java-1_5_0-sun-devel +%endif # suse_version > 1030 +%endif # suse_version > 1110 +%endif # sles_version +%endif # ifarch +%if %with_java +BuildRequires: junit +%endif #with_java %if 0%{?suse_version} > 1030 BuildRequires: libneon-devel %else BuildRequires: neon-devel openldap2-devel -%endif -BuildRequires: sqlite-devel -Version: 1.6.1 -Release: 1 +%endif # suse_version > 1030 # %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services # -%define apxs /usr/sbin/apxs2 +%define apxs /usr/sbin/apxs2 %define apache_libexecdir %(%{apxs} -q LIBEXECDIR) %define apache_sysconfdir %(%{apxs} -q SYSCONFDIR) -%define apache_mmn %(MMN=$(%{apxs} -q LIBEXECDIR)_MMN; test -x $MMN && $MMN) -%define site_python %(python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()") +%define apache_mmn %(MMN=$(%{apxs} -q LIBEXECDIR)_MMN; test -x $MMN && $MMN) +%if %{!?site_python:1}0 +%define site_python %(%__python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()") +%endif # PreReq: %insserv_prereq %fillup_prereq # @@ -47,25 +121,49 @@ 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-%{version}.tar.bz2 +Source0: http://subversion.tigris.org/downloads/subversion-%{version}.tar.bz2 Source1: subversion.conf Source2: subversion.README.SuSE Source9: subversion.rcsvnserve +# http://prdownloads.sourceforge.net/swig/swig-%{swig_version}.tar.bz2 Source10: subversion.sysconfig.svnserve Source12: subversion.sysconfig.svnserve.remoteaccess Source13: subversion.xinetd.svnserve Source42: subversion.svngrep.sh Source43: subversion.svndiff.sh +Source90: swig-%{swig_version}.tar.bz2 +%if %with_intree_sqlite +# http://www.sqlite.org/sqlite-amalgamation-%{sqlite_version}.tar.gz +Source91: sqlite-amalgamation-%{sqlite_version}.tar.bz2 +%else +BuildRequires: sqlite-devel >= %{sqlite_version} +%endif # with_intree_sqlite # Patch11: subversion.libtool-verbose.patch +Patch12: subversion-fix_nonvoid_function_without_return.patch # build fixes Patch20: subversion-swig-perl-install_vendor.patch Patch23: subversion.libtool-pie-flags.patch Patch31: subversion.perl.LD_RUN_PATH.patch Patch33: subversion.header_wrappers.patch +Patch34: subversion.allowed-neon.patch Patch35: subversion.java14.patch -Patch36: gcc-warnings.diff +Patch36: subversion-ctypes-remove_shebang.patch # +%if %with_ruby +%if %{!?rb_arch:1}0 +%define rb_arch %(echo "%{_host_cpu}-%{_os}" | sed -e "s/i686/i586/" -e "s/armv5tel/armv4l/" -e "s/hppa2.0/hppa/") +%endif +%if %{!?rb_major_ver:1}0 +%define rb_major_ver %(/usr/bin/ruby -e 'puts VERSION'|cut -f1,2 -d.) +%endif +%if %{!?site_ruby:1}0 +%define site_ruby %{_usr}/%{_lib}/ruby/site_ruby/%{rb_major_ver} +%endif +%endif # with_ruby +%if %with_java +Provides: subversion-javahl = %{version}-%{release} +%endif # with_java %description Subversion does the same thing cvs (CVS (Concurrent Versioning System)) @@ -131,12 +229,41 @@ License: The Apache Software License; Subversion License, http://subversi Group: Development/Tools/Version Control Summary: Allows Python scripts to directly use Subversion repositories. Requires: subversion = %{version} +%if 0%{?sles_version} == 9 +Requires: python25 +%endif %description python -Provides Pythong (SWIG) support for Subversion. +Provides Python (SWIG) support for Subversion. +%if %with_python_ctypes + +%package python-ctypes + +Group: Development/Tools/Version Control +Summary: High-Level Python Bindings for Subversion +Requires: subversion = %{version} + +%description python-ctypes +Provides high-level Python support for Subversion, based on ctypes. +%endif # with_python_ctypes +%if %with_ruby + +%package ruby +License: The Apache Software License; Subversion License, http://subversion.tigris.org/license-1.html +Group: Development/Tools/Version Control +Summary: Allows Ruby scripts to directly use Subversion repositories. +Requires: subversion = %{version} + +%description ruby +Provides Ruby (SWIG) support for Subversion. + + + +%endif # with_ruby + %package server License: The Apache Software License Group: Development/Tools/Version Control @@ -151,30 +278,99 @@ http://subversion.tigris.org +%if %with_kde4_kwallet + +%package auth-kde4-kwallet +License: Subversion license, http://subversion.tigris.org/license-1.html +Summary: A Concurrent Versioning system similar to but better than CVS +Group: Development/Tools/Version Control + +%description auth-kde4-kwallet +Subversion does the same thing cvs (CVS (Concurrent Versioning System)) +but has major enhancements compared to CVS. The name of the cmdline +client is svn. + + + +%endif # with_kde4_kwallet +%if %with_gnome_keyring + +%package auth-gnome-keyring +License: Subversion license, http://subversion.tigris.org/license-1.html +Summary: A Concurrent Versioning system similar to but better than CVS +Group: Development/Tools/Version Control + +%description auth-gnome-keyring +Subversion does the same thing cvs (CVS (Concurrent Versioning System)) +but has major enhancements compared to CVS. The name of the cmdline +client is svn. + + + +%endif # with_gnome_keyring + %prep -swig="`env -i swig -version 2>&1 | awk '/^SWIG Version/{ print $3 }'`" -case "$swig" in - 1.3.21|1.3.1*) - echo "installed swig $swig too old" - exit 1 - ;; -esac -%setup -q -n subversion-%{version} +%setup -q -n subversion-%{version} -b 90 # +%if %with_intree_sqlite +%__install -d ./sqlite-amalgamation +pushd ./sqlite-amalgamation +%__bzip2 -d -c "%{SOURCE91}" | %__tar xf - "sqlite-%{sqlite_version}/sqlite3.c" +%__mv "sqlite-%{sqlite_version}/sqlite3.c" . +%__rm -rf "sqlite-%{sqlite_version}" +popd #./sqlite-amalgamation +%endif # with_intree_sqlite # -%patch11 -p1 +%patch11 -p0 +%patch12 -p0 # %patch20 -p1 %if 0%{?suse_version} > 930 -#%patch23 -p1 +%patch23 -p0 %endif %patch31 -p1 %patch33 -p1 +%patch34 -p0 %patch35 -p1 -%patch36 +%patch36 -p0 +%if 0%{?sles_version} == 9 +%__grep -rwl '/usr/bin/python' . | xargs %__sed -i 's|/usr/bin/python|%{_usr}/bin/python2.5|g' +%__grep -rwl '/usr/bin/env python' . | xargs %__sed -i 's|/usr/bin/env python|%{_usr}/bin/python2.5|g' +%endif %build +%if 0%{?sles_version} == 9 +mkdir BUILDPATH +%__ln_s "%{_usr}/bin/python2.5" "BUILDPATH/python" +export PATH="$PWD/BUILDPATH:$PATH" +export PYTHON="%{_usr}/bin/python2.5" +%endif +SWIG_ROOT=`cd ..; pwd`/intree-swig +pushd "../swig-%{swig_version}" +CFLAGS="%{optflags}" \ +CXXFLAGS="%{optflags}" \ +./configure \ + --prefix="$SWIG_ROOT" \ + --libdir="$SWIG_ROOT/%{_lib}" \ + --without-tcl \ + --without-java \ + --without-gcj \ + --without-guile \ + --without-mzscheme \ + --without-ocaml \ + --without-pike \ + --without-chicken \ + --without-csharp \ + --without-lua \ + --without-allegrocl \ + --without-clisp \ + --without-r \ + --with-swiglibdir="$SWIG_ROOT/share/swig" +%__make %{?jobs:-j%{jobs}} +%__make install +popd #swig with_jdk=none +%if %with_java for i in \ /usr/%{_lib}/jvm/java-openjdk \ /usr/%{_lib}/jvm/java \ @@ -199,10 +395,7 @@ with_jdk="$i" break fi done -%if 0%{?suse_version} < 1020 - # disable javahl bindings - with_jdk=none -%endif +%endif # with_java if [ "$with_jdk" != "none" ] ; then with_jdk="--with-jdk=$with_jdk --enable-javahl" echo with_jdk > with_jdk @@ -211,17 +404,18 @@ cat > with_jdk.files < with_jdk.files fi -%ifarch ppc ppc64 +%if !%with_java with_jdk="" rm -f with_jdk echo -n '' > with_jdk.files -%endif +%endif # !with_java cat with_jdk.files # ### these possibly need further discussion # swig_pydir = @libdir@/svn-python/libsvn @@ -247,11 +441,12 @@ export CFLAGS="$(%{apxs} -q CFLAGS) -Wall -g" %if 0%{?suse_version} > 930 CFLAGS="$CFLAGS -fpie" export LDFLAGS=-pie -%endif +%endif # suse_version > 930 %if 0%{?suse_version} > 1000 CFLAGS="$CFLAGS -fstack-protector" -%endif +%endif # suse_version > 1000 export CXXFLAGS="$CFLAGS" +export PATH="${SWIG_ROOT}/bin:${PATH}" %configure \ --with-editor="vim -c 'set tw=72 et' " \ --with-neon=%{_prefix} \ @@ -260,32 +455,92 @@ export CXXFLAGS="$CFLAGS" --with-apxs=%{apxs} \ --with-zlib=%{_prefix} \ $with_jdk \ +%if %with_java + --with-junit="%{_usr}/share/java/junit.jar" \ +%endif --with-jikes=no \ - --with-swig \ + --with-swig="$SWIG_ROOT" \ +%if %with_intree_sqlite + --with-sqlite="./sqlite-amalgamation/sqlite3.c" \ +%else + --with-sqlite="%{_usr}" \ +%endif +%if %with_gnome_keyring + --with-gnome-keyring \ +%endif +%if %with_kde4_kwallet + --with-kwallet \ +%endif --disable-mod-activation \ --disable-static %if 0%{?suse_version} == 910 sed --in-place=~ "s,\/usr\/lib ,%{_libdir} ,g" Makefile %endif -make %{?jobs:-j%jobs} SWIG_LDFLAGS= +%__make %{?jobs:-j%jobs} SWIG_LDFLAGS= # if [ "$with_jdk" != "" ] ; then with_jdk=javahl fi -make swig-py swig-pl SWIG_LDFLAGS= $with_jdk +%if %with_ruby +ruby_target=swig-rb +%else +ruby_target= +%endif # with_ruby +%if %with_python_ctypes +python_ctypes_target=ctypes-python +%else +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 +%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 with_jdk= fi -make DESTDIR=$RPM_BUILD_ROOT install install-swig-pl install-swig-py $with_jdk +%if %with_ruby +ruby_target=install-swig-rb +%else +ruby_target= +%endif # with_ruby +%if %with_python_ctypes +python_ctypes_target=install-ctypes-python +%else +python_ctypes_target= +%endif # with_python_ctypes +%__make DESTDIR="$RPM_BUILD_ROOT" install install-swig-pl install-swig-py $python_ctypes_target $ruby_target $with_jdk +%if %with_python_ctypes +# remove csvn .pyc files and recompile them because they contain the $RPM_BUILD_ROOT path: +find "%{buildroot}%{py_sitedir}/csvn/" -name "*.pyc" | xargs %__rm -f +%__python "%{py_libdir}/compileall.py" -f -d "%{py_sitedir}/csvn" "%{buildroot}/%{py_sitedir}/csvn" +%endif # with_python_ctypes # # double check that the essential repository access schemes have been compiled in # -schemes=$(LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT/usr/bin/svn --version | grep "'" | cut -d\' -f2) +schemes=$(LD_LIBRARY_PATH="${RPM_BUILD_ROOT}%{_libdir}" "${RPM_BUILD_ROOT}%{_bindir}/svn" --version | %__grep "'" | cut -d\' -f2) # reset vim syntax: ' test "$schemes" = "http https @@ -295,8 +550,8 @@ file" %perl_process_packlist %find_lang %name # -cp -Lav %{S:42} $RPM_BUILD_ROOT/usr/bin/svngrep -cp -Lav %{S:43} $RPM_BUILD_ROOT/usr/bin/svndiff +cp -Lav %{S:42} $RPM_BUILD_ROOT%{_bindir}/svngrep +cp -Lav %{S:43} $RPM_BUILD_ROOT%{_bindir}/svndiff # mkdir -p $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/ cp -avL contrib/client-side/emacs/*.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/ @@ -346,9 +601,29 @@ mkdir -p $RPM_BUILD_ROOT/%{_fwdefdir} install -m 644 %{S:12} $RPM_BUILD_ROOT/%{_fwdefdir}/svnserve #useless libtool stuff rm -f %{buildroot}%{_libdir}/*.la +pushd tools/server-side +%__install -m0755 \ + svn-populate-node-origins-index \ + svnauthz-validate \ + "%{buildroot}%{_bindir}/" +# 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 +fi + +%check +%if 0%{?sles_version} == 9 +export PATH="$PWD/BUILDPATH:$PATH" +%endif +%if %with_java +%__make check-javahl +%endif # with_java %clean -rm -rf $RPM_BUILD_ROOT +%__rm -rf "%{buildroot}" %preun %stop_on_removal svnserve @@ -369,6 +644,24 @@ rm -rf $RPM_BUILD_ROOT %post -n subversion-perl -p /sbin/ldconfig %postun -n subversion-perl -p /sbin/ldconfig +%if %with_ruby + +%post -n subversion-ruby -p /sbin/ldconfig + +%postun -n subversion-ruby -p /sbin/ldconfig +%endif # with_ruby +%if %with_gnome_keyring + +%post -n subversion-auth-gnome-keyring -p /sbin/ldconfig + +%postun -n subversion-auth-gnome-keyring -p /sbin/ldconfig +%endif # with_gnome_keyring +%if %with_kde4_kwallet + +%post -n subversion-auth-kde4-kwallet -p /sbin/ldconfig + +%postun -n subversion-auth-kde4-kwallet -p /sbin/ldconfig +%endif # with_kde4_kwallet %files -f files.subversion %defattr(-,root,root) @@ -417,6 +710,26 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libsvn_swig_py-1.so.* %{site_python}/libsvn/* %{site_python}/svn/* +%if %with_python_ctypes + +%files python-ctypes +%defattr(-,root,root) +%doc subversion/bindings/ctypes-python/examples +%dir %{site_python} +%{site_python}/csvn +%if %suse_version >= 1020 +%{site_python}/svn_ctypes_python_bindings-*-py%{py_ver}.egg-info +%endif # suse_version >= 1020 +%endif # with_python_ctypes +%if %with_ruby + +%files ruby +%defattr(-,root,root) +%dir %{site_ruby} +%{site_ruby}/svn +%{site_ruby}/%{rb_arch}/svn +%{_libdir}/libsvn_swig_ruby-1.so.* +%endif # with_ruby %files devel %defattr(-,root,root) @@ -428,8 +741,10 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %dir /usr/share/subversion /usr/share/subversion/tools -%attr(755,root,root) /usr/bin/svnmerge.py -%attr(755,root,root) /usr/bin/svn_apply_autoprops.py +%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 %files server %defattr(-,root,root) @@ -438,8 +753,68 @@ rm -rf $RPM_BUILD_ROOT %dir %{apache_libexecdir} %{apache_libexecdir}/mod_dav_svn.* %{apache_libexecdir}/mod_authz_svn.* +%if %with_gnome_keyring + +%files auth-gnome-keyring +%defattr(-,root,root) +%{_libdir}/libsvn_auth_gnome_keyring-1.so.0 +%{_libdir}/libsvn_auth_gnome_keyring-1.so.0.* +%endif # with_gnome_keyring +%if %with_kde4_kwallet + +%files auth-kde4-kwallet +%defattr(-,root,root) +%{_libdir}/libsvn_auth_kwallet-1.so.0 +%{_libdir}/libsvn_auth_kwallet-1.so.0.* +%endif # with_kde4_kwallet %changelog +* Wed Jun 03 2009 dmueller@suse.de +- merge into Factory +* Tue May 26 2009 pascal.bleser@opensuse.org +- update to sqlite-amalgamation 3.6.14.2 +* Fri May 15 2009 pascal.bleser@opensuse.org +- enable in-tree sqlite-amalgamation again, as the required sqlite3 + package screws up zypper (bnc#504251) +* Mon May 11 2009 pascal.bleser@opensuse.org +- bump in-tree sqlite-amalgamation to the recommended version for + Subversion 1.6.2: 3.6.13 +- update to 1.6.2: + * vastly improve memory usage with 'svn merge' (issue #3393) + * make default depth for merge 'infinity' (r37156) + * make 'status --quiet' show tree conflicts (issue #3396) + * allow '--set-depth infinity' to expand shallow subtrees + (r37169) + * return an error if attempting to reintegrate from/to the repo + root (r37385) + * don't store bogus mergeinfo for '--ignore-ancestry', foreign + merges (r37333) + * don't allow merge of difference between two repos (r37519) + * avoid potential segfault with subtree mergeinfo (r36613) + * recommend sqlite 3.6.13 (r37245) + * avoid unnecessary server query for implicit mergeinfo + (r36509) + * avoid unnecessary server query during reverse merges (r36527) + * set depth=infinity on 'svn add' items with restricted depth + (r37607) + * fixed: commit log message template missing paths (issue #3399) + * fixed: segfault on merge with servers < 1.6 (r37363) + * fixed: repeat merge failures with non-inheritable mergeinfo + (issue #3392) + * fixed: another memory leak when performing mergeinfo-aware + merges (r37398) + * fixed: incorrect mergeinfo on children of shallow merges + (issue #3407) + * fixed: pool lifetime issues in the BDB backend (r37137) +* Thu May 07 2009 pascal.bleser@opensuse.org +- build and install the following binaries from tools/server-side + into subversion-tools: + * svn-populate-node-origins-index + * svnauthz-validate +- add support for building Subversion 1.6.x on SLE 9, by using the + package "python25" and patching all python scripts accordingly, + to use #!/usr/bin/python2.5 instead of /usr/bin/python or + /usr/bin/env python * Wed Apr 15 2009 dmueller@suse.de - update to 1.6.1 User-visible changes: @@ -477,6 +852,83 @@ rm -rf $RPM_BUILD_ROOT * stop setting default translation domain in JavaHL (r36955) * fixed: warning with Python 2.6 and ctypes bindings (r36559) * fixed: undefined references to svn_fs_path_change2_create() (r36823) +* Mon Mar 30 2009 pascal.bleser@opensuse.org +- fix build on SLE10 +- don't build on SLE9, its python is too old (requires >= 2.4) +- build gnome-keyring and kde4 kwallet authentication store plugins + as subpackages +- added explicit BuildRequires for cyrus-sasl-devel +- use an in-tree sqlite 3.6.11 as recommended instead of the + system-wide version +- removed the %%changelog from the spec file, was very long, and we + have a .changes file anyway +- rpmlint happiness: + * added a patch to remove a pointless shebang in the python + bindings + * removed dot at end of Summary in subpackages +- removed the License: tag in each subpackage +* Mon Mar 23 2009 pascal.bleser@opensuse.org +- build the new ctypes python bindings +- upgraded in-tree SWIG to the recommended version for building + SVN: 1.3.36 (required to build the Ruby bindings) +- 1.6.0 in a separate repository for now +- update to 1.6.0: + * the working copy format has been upgraded: this means that 1.5 + and older Subversion clients will not be able to work with + working copies produced by Subversion 1.6; working copies are + upgraded automatically + * the repository filesystem formats have changed, meaning that + 1.5 and older versions of Subversion tools that normally access + a repository directly (e.g. svnserve, mod_dav_svn, svnadmin) + won't be able to read a repository created by Subversion 1.6; + but, repositories are not upgraded automatically (use + "svnadmin upgrade") + * improved output of "svn proplist --verbose" + * "svn propget" now accepts the --verbose option + * changed output of "svn status": now contains the additional + seventh column which informs whether the item is the victim of a + tree conflict; an additional line with more detailed description + of a tree conflict is displayed after each item remaining in tree + conflict + * subversion prompts before storing passwords in plaintext form + * passwords can be stored in KWallet (KDE 4) and GNOME Keyring + * SSL client certificate passphrases can be stored in KWallet, + GNOME Keyring in encrypted form or in plaintext form + * repository root relative URLs (client) + * improvements to "svn:externals": support for files and usual shell + quoting rules in external definitions + * detection of tree conflicts: Subversion 1.6 recognizes a new kind + of conflict, known as a "tree conflict"; such conflicts manifest + at the level of directory structure, rather than file content + * several improvements to both the Berkeley DB and FSFS backends, + designed to improve storage space, and can result in drastically + smaller repositories: + + sharing multiple common representations + + FSFS repositories: packing completed shards + + FSFS repositories: support for Memcached + + BDB repositories: reverse deltas + * ctypes Python bindings + * improved interactive conflict resolution + * sparse directory exclusion + * logging support for svnserve + * new public "historical" HTTP URI syntax for mod_dav_svn + * the "svn log" command can now take multiple revision arguments in + one invocation + * --trust-server-cert option: added to svn and svnsync, so that + non-interactive operations can work with self-signed certificates + not backed by a known trust authority +* Mon Mar 09 2009 pascal.bleser@opensuse.org +- enable build of ruby bindings by using an in-tree SWIG 1.3.33 +- update to 1.5.6: + * allow colons within mergeinfo path names (r35040) + * make it impossible to add .svn to wc via 'svn add --parents' + (r35143, -5) + * copy properties of added but uncommitted files (r32448) + * improve performance of log operation on < 1.5 servers (r35566) + * allow commits over Neon of files >2GB (POSIX only) (r34919, -24) + * allow serf from behind MS ISA proxy servers (r35981) + * prevent svnmerge-migrate-history.py from committing bogus + mergeinfo (r35516) * Wed Feb 18 2009 crrodriguez@suse.de - all apache modules must require %%{apache_mmn} * Mon Jan 12 2009 olh@suse.de diff --git a/swig-1.3.36.tar.bz2 b/swig-1.3.36.tar.bz2 new file mode 100644 index 0000000..b272677 --- /dev/null +++ b/swig-1.3.36.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bfae3308533aa671dd9912612cc59de9109d161efc203d7c58f3ba370f48040a +size 3705329