add fix for ppc breakage (Andreas Stieger, #985582)
Resolves: rhbz#985582
This commit is contained in:
parent
d25854b52d
commit
45b051edd1
15
subversion-1.8.4-r1543145.patch
Normal file
15
subversion-1.8.4-r1543145.patch
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
|
||||||
|
https://svn.apache.org/viewvc?view=revision&revision=1543145
|
||||||
|
|
||||||
|
--- subversion-1.8.4/subversion/svn/status-cmd.c
|
||||||
|
+++ subversion-1.8.4/subversion/svn/status-cmd.c
|
||||||
|
@@ -358,7 +358,8 @@
|
||||||
|
NULL, opt_state->quiet,
|
||||||
|
/* not versioned: */
|
||||||
|
SVN_ERR_WC_NOT_WORKING_COPY,
|
||||||
|
- SVN_ERR_WC_PATH_NOT_FOUND));
|
||||||
|
+ SVN_ERR_WC_PATH_NOT_FOUND,
|
||||||
|
+ SVN_NO_ERROR));
|
||||||
|
|
||||||
|
if (opt_state->xml)
|
||||||
|
SVN_ERR(print_finish_target_xml(repos_rev, iterpool));
|
@ -26,7 +26,7 @@
|
|||||||
Summary: A Modern Concurrent Version Control System
|
Summary: A Modern Concurrent Version Control System
|
||||||
Name: subversion
|
Name: subversion
|
||||||
Version: 1.8.4
|
Version: 1.8.4
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
URL: http://subversion.apache.org/
|
URL: http://subversion.apache.org/
|
||||||
@ -43,6 +43,7 @@ Patch2: subversion-1.8.0-pie.patch
|
|||||||
Patch3: subversion-1.8.0-kwallet.patch
|
Patch3: subversion-1.8.0-kwallet.patch
|
||||||
Patch4: subversion-1.8.0-rubybind.patch
|
Patch4: subversion-1.8.0-rubybind.patch
|
||||||
Patch5: subversion-1.8.0-aarch64.patch
|
Patch5: subversion-1.8.0-aarch64.patch
|
||||||
|
Patch6: subversion-1.8.4-r1543145.patch
|
||||||
BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
|
BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
|
||||||
BuildRequires: %{dbdevel} >= 4.1.25, swig >= 1.3.24, gettext
|
BuildRequires: %{dbdevel} >= 4.1.25, swig >= 1.3.24, gettext
|
||||||
BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
|
BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
|
||||||
@ -181,6 +182,7 @@ This package includes supplementary tools for use with Subversion.
|
|||||||
%patch3 -p1 -b .kwallet
|
%patch3 -p1 -b .kwallet
|
||||||
%patch4 -p1 -b .rubybind
|
%patch4 -p1 -b .rubybind
|
||||||
%patch5 -p1 -b .aarch64
|
%patch5 -p1 -b .aarch64
|
||||||
|
%patch6 -p1 -b .r1543145
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# Regenerate the buildsystem, so that:
|
# Regenerate the buildsystem, so that:
|
||||||
@ -347,10 +349,7 @@ export LIBC_FATAL_STDERR_=1
|
|||||||
if ! make check check-swig-pl check-swig-py check-swig-rb CLEANUP=yes; then
|
if ! make check check-swig-pl check-swig-py check-swig-rb CLEANUP=yes; then
|
||||||
: Test suite failure.
|
: Test suite failure.
|
||||||
cat fails.log
|
cat fails.log
|
||||||
%ifnarch ppc ppc64
|
|
||||||
# See #985582
|
|
||||||
exit 1
|
exit 1
|
||||||
%endif
|
|
||||||
fi
|
fi
|
||||||
# check-swig-rb omitted: it runs svnserve
|
# check-swig-rb omitted: it runs svnserve
|
||||||
%if %{with_java}
|
%if %{with_java}
|
||||||
@ -477,6 +476,9 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Nov 18 2013 Joe Orton <jorton@redhat.com> - 1.8.4-2
|
||||||
|
- add fix for ppc breakage (Andreas Stieger, #985582)
|
||||||
|
|
||||||
* Tue Oct 29 2013 Joe Orton <jorton@redhat.com> - 1.8.4-1
|
* Tue Oct 29 2013 Joe Orton <jorton@redhat.com> - 1.8.4-1
|
||||||
- update to 1.8.4
|
- update to 1.8.4
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user