This commit is contained in:
parent
ead150b1f2
commit
ff8fcda60c
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:9788a5a19d032b7711b54f462f40b72ee0c6180069335db6994d96b7b23c4075
|
|
||||||
size 5470969
|
|
3
subversion-1.6.3-rpmlintrc
Normal file
3
subversion-1.6.3-rpmlintrc
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
# libsvn_subr calls exit as part of the default malfunction handler.
|
||||||
|
# That's OK. Library users are expected to override the default handler.
|
||||||
|
addFilter("subversion.*shared-lib-calls-exit.*libsvn_subr-1.so.*")
|
3
subversion-1.6.3.tar.bz2
Normal file
3
subversion-1.6.3.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:1dfd4550ae87687c5031665d3b1624082130b4dc235b1084eb0c6279f8e2ee6c
|
||||||
|
size 5483625
|
@ -1,3 +1,78 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jul 6 19:19:23 CEST 2009 - stsp@elego.de
|
||||||
|
|
||||||
|
- Run regression tests over both filesystem backends (FSFS and BDB),
|
||||||
|
and over svn:// as well as file://
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jul 6 17:57:30 CEST 2009 - stsp@elego.de
|
||||||
|
|
||||||
|
- Now that the project repositories have been configured correctly
|
||||||
|
on the build service, OpenSUSE 10.3 should also have a JDK.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jul 3 18:17:20 CEST 2009 - stsp@elego.de
|
||||||
|
|
||||||
|
- Make python-xml an explicit build requirement since the regression
|
||||||
|
tests need it to run.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jul 3 17:16:42 CEST 2009 - stsp@elego.de
|
||||||
|
|
||||||
|
- Make regression tests clean up temporary test data (repositories,
|
||||||
|
working copies, etc.) to avoid build failures due to running out
|
||||||
|
of disk space. This trades time against space -- the build will
|
||||||
|
take longer.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jul 3 16:54:23 CEST 2009 - stsp@elego.de
|
||||||
|
|
||||||
|
- The build service keeps complaining that "nothing provides
|
||||||
|
java-1_6_0-sun-devel". Attempt to make it happy by only building
|
||||||
|
Java bindings on SUSE versions which have OpenJDK.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jul 3 15:36:45 CEST 2009 - stsp@elego.de
|
||||||
|
|
||||||
|
- write tests.log to stdout if make check fails to aid
|
||||||
|
debugging of test failures on the build service
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jul 3 13:33:38 CEST 2009 - stsp@elego.de
|
||||||
|
|
||||||
|
- run all regression tests (ra_local only for now)
|
||||||
|
- filter a false positive rpmlint warning
|
||||||
|
- update to 1.6.3
|
||||||
|
User-visible changes:
|
||||||
|
* fix segfault in WC->URL copy (r37646, -56)
|
||||||
|
* let 'svnadmin load' tolerate mergeinfo with "\r\n" (r37768)
|
||||||
|
* make svnsync normalize svn:* props to LF line endings (issue #3404)
|
||||||
|
* better integration with external merge tools (r36178)
|
||||||
|
* return a friendly error message for 'svn diff' (r37735)
|
||||||
|
* update dsvn.el for 1.6 (r37774)
|
||||||
|
* don't allow setting of props on out-of-date dirs under neon (r37745)
|
||||||
|
* improve BASH completion (r36450, -52, -70, -79, -538)
|
||||||
|
* improve some DAV-based error messages (issue #3414)
|
||||||
|
* always show tree conflicts with 'svn st' (issue #3382)
|
||||||
|
* improve correctness of 'svn mergeinfo' (issue #3126)
|
||||||
|
* decrease the amount of memory needed for large commits (r37894, -6)
|
||||||
|
* work around an APR buffer overflow seen by svnsync (r37622)
|
||||||
|
* ra_svn clients now use TCP keep-alives if available (issue #3347)
|
||||||
|
* improve 'svn merge' perf by reducing server contact (r37491, -593, -618)
|
||||||
|
* stop propagating self-referential mergeinfo in reintegrate merges (r37931)
|
||||||
|
* fix NLS detection where -liconv is required for bindtextdomain() (r37827)
|
||||||
|
* don't delete unversioned files with 'rm --keel-local' (r38015, -17, -19)
|
||||||
|
* bump apr and apr-util versions included in deps to latest. (r37941)
|
||||||
|
* avoid temp file name collisions with ra_serf, ra_neon (r37972)
|
||||||
|
* fixed: potential segfault with noop file merges (r37779)
|
||||||
|
* fixed: incorrect output with 'svn blame -g' (r37719, -23, -41)
|
||||||
|
* fixed: bindings don't load FS libs when module search enabled (issue #3413)
|
||||||
|
* fixed: potential abort() in the working copy library (r37857)
|
||||||
|
* fixed: memory leak in hash reading functions (r37868, -979)
|
||||||
|
Developer-visible changes:
|
||||||
|
* improve memory usage in file-to-stringbuf APIs (r37907)
|
||||||
|
* reduce memory usage for temp string manipulation (r38010)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jun 29 17:26:47 CEST 2009 - dmueller@suse.de
|
Mon Jun 29 17:26:47 CEST 2009 - dmueller@suse.de
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package subversion (Version 1.6.2)
|
# spec file for package subversion (Version 1.6.3)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
# Copyright (c) 2009 Pascal Bleser <pascal.bleser@opensuse.org>
|
# Copyright (c) 2009 Pascal Bleser <pascal.bleser@opensuse.org>
|
||||||
@ -41,8 +41,8 @@
|
|||||||
%endif # suse_version > 1030
|
%endif # suse_version > 1030
|
||||||
|
|
||||||
Name: subversion
|
Name: subversion
|
||||||
Version: 1.6.2
|
Version: 1.6.3
|
||||||
Release: 4
|
Release: 1
|
||||||
# in-tree SWIG version to use for the build:
|
# in-tree SWIG version to use for the build:
|
||||||
%define swig_version 1.3.36
|
%define swig_version 1.3.36
|
||||||
%define sqlite_version 3.6.14.2
|
%define sqlite_version 3.6.14.2
|
||||||
@ -52,9 +52,9 @@ BuildRequires: update-alternatives
|
|||||||
BuildRequires: apache2-devel db-devel gcc gcc-c++ glibc-devel libstdc++-devel zlib-devel
|
BuildRequires: apache2-devel db-devel gcc gcc-c++ glibc-devel libstdc++-devel zlib-devel
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
%if 0%{?sles_version} == 9
|
%if 0%{?sles_version} == 9
|
||||||
BuildRequires: python25 python25-devel
|
BuildRequires: python-xml python25 python25-devel
|
||||||
%else
|
%else
|
||||||
BuildRequires: python-devel
|
BuildRequires: python-devel python-xml
|
||||||
%endif
|
%endif
|
||||||
%if %with_python_ctypes
|
%if %with_python_ctypes
|
||||||
BuildRequires: ctypesgen
|
BuildRequires: ctypesgen
|
||||||
@ -80,19 +80,20 @@ BuildRequires: kdelibs4-core libkde4-devel libqt4-devel
|
|||||||
# no JDK on SLE either
|
# no JDK on SLE either
|
||||||
%define with_java 0
|
%define with_java 0
|
||||||
%else
|
%else
|
||||||
# JDK is available on the other targets
|
%if 0%{?suse_version} >= 1100
|
||||||
|
# OpenJDK is available by default on openSUSE >= 11.0
|
||||||
%define with_java 1
|
%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
|
BuildRequires: java-1_6_0-openjdk-devel
|
||||||
%else
|
%else
|
||||||
%if 0%{?suse_version} > 1030
|
%if 0%{?suse_version} == 1030
|
||||||
BuildRequires: java-1_6_0-sun-devel
|
BuildRequires: java-1_6_0-sun-devel
|
||||||
|
%define with_java 1
|
||||||
%else
|
%else
|
||||||
|
# Older OpenSUSE version might still have a 1.5 JDK around
|
||||||
BuildRequires: java-1_5_0-sun-devel
|
BuildRequires: java-1_5_0-sun-devel
|
||||||
%endif # suse_version > 1030
|
%define with_java 1
|
||||||
%endif # suse_version > 1110
|
%endif # suse_version == 1030
|
||||||
|
%endif # suse_version >= 1100
|
||||||
%endif # sles_version
|
%endif # sles_version
|
||||||
%endif # ifarch
|
%endif # ifarch
|
||||||
%if %with_java
|
%if %with_java
|
||||||
@ -139,6 +140,7 @@ Source91: sqlite-amalgamation-%{sqlite_version}.tar.bz2
|
|||||||
%else
|
%else
|
||||||
BuildRequires: sqlite-devel >= %{sqlite_version}
|
BuildRequires: sqlite-devel >= %{sqlite_version}
|
||||||
%endif # with_intree_sqlite
|
%endif # with_intree_sqlite
|
||||||
|
Source92: %{name}-%{version}-rpmlintrc
|
||||||
#
|
#
|
||||||
Patch11: subversion.libtool-verbose.patch
|
Patch11: subversion.libtool-verbose.patch
|
||||||
Patch12: subversion-fix_nonvoid_function_without_return.patch
|
Patch12: subversion-fix_nonvoid_function_without_return.patch
|
||||||
@ -623,9 +625,27 @@ fi
|
|||||||
%if 0%{?sles_version} == 9
|
%if 0%{?sles_version} == 9
|
||||||
export PATH="$PWD/BUILDPATH:$PATH"
|
export PATH="$PWD/BUILDPATH:$PATH"
|
||||||
%endif
|
%endif
|
||||||
|
# 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"
|
||||||
|
# run test over ra_local (file://)
|
||||||
|
for fstype in fsfs bdb; do
|
||||||
|
%__make check CLEANUP=true FS_TYPE=$fstype || cat tests.log
|
||||||
|
done
|
||||||
|
# run tests over ra_svn (svn://)
|
||||||
|
$PWD/subversion/svnserve/svnserve --listen-host 127.0.0.1 --pid-file $PWD/svnserve.pid -d -r $PWD/subversion/tests/cmdline
|
||||||
|
for fstype in fsfs bdb; do
|
||||||
|
%__make check CLEANUP=true FS_TYPE=$fstype BASE_URL=svn://127.0.0.1 || cat tests.log
|
||||||
|
done
|
||||||
|
kill `cat $PWD/svnserve.pid`
|
||||||
%if %with_java
|
%if %with_java
|
||||||
%__make check-javahl
|
%__make check-javahl
|
||||||
%endif # with_java
|
%endif # with_java
|
||||||
|
%__make check-swig-pl
|
||||||
|
%__make check-swig-py
|
||||||
|
%if %with_ruby
|
||||||
|
%__make check-swig-rb
|
||||||
|
%endif # with_ruby
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
%__rm -rf "%{buildroot}"
|
%__rm -rf "%{buildroot}"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user