From 6264eabccb9c9ce993b5eb06d9887b06bc88c912 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Thu, 1 Dec 2011 13:42:09 +0000
Subject: [PATCH] update to 1.7.1 (temporarily) disable failing kwallet support

---
 .gitignore      |  1 +
 sources         |  2 +-
 subversion.spec | 24 ++++++++++++++++++++----
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2a45b5d..e67bc8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ subversion-1.6.12.tar.bz2
 /subversion-1.7.0.tar.bz2
 /subversion-1.7.0
 /clog
+/subversion-1.7.1.tar.bz2
diff --git a/sources b/sources
index eec2a57..214f90b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-930e6644a1b6094efd268fde6a318f04  subversion-1.7.0.tar.bz2
+8a4fa74385df85a9702141b6b68b8307  subversion-1.7.1.tar.bz2
diff --git a/subversion.spec b/subversion.spec
index e112da3..23f97cd 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -2,6 +2,7 @@
 %define make_check 1
 
 %define with_java 1
+%define with_kwallet 0
 
 # set JDK path to build javahl; default for JPackage
 %define jdk_path /usr/lib/jvm/java
@@ -14,8 +15,8 @@
 
 Summary: A Modern Concurrent Version Control System
 Name: subversion
-Version: 1.7.0
-Release: 3%{?dist}
+Version: 1.7.1
+Release: 1%{?dist}
 License: ASL 2.0
 Group: Development/Tools
 URL: http://subversion.apache.org/
@@ -33,7 +34,6 @@ BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext
 BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
 BuildRequires: neon-devel >= 0:0.24.7-1, cyrus-sasl-devel
 BuildRequires: sqlite-devel >= 3.4.0, file-devel
-BuildRequires: gnome-keyring-devel, dbus-devel, kdelibs-devel >= 4.0.0
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides: svn = %{version}-%{release}
 Requires: subversion-libs%{?_isa} = %{version}-%{release}
@@ -85,19 +85,23 @@ for developers interacting with the subversion package.
 Group: Development/Tools
 Summary: GNOME Keyring support for Subversion
 Requires: subversion%{?_isa} = %{version}-%{release}
+BuildRequires: gnome-keyring-devel, dbus-devel
 
 %description gnome
 The subversion-gnome package adds support for storing Subversion
 passwords in the GNOME Keyring.
 
+%if %{with_kwallet}
 %package kde
 Group: Development/Tools
 Summary: KDE Wallet support for Subversion
 Requires: subversion%{?_isa} = %{version}-%{release}
+BuildRequires: kdelibs-devel >= 4.0.0
 
 %description kde
 The subversion-kde package adds support for storing Subversion
 passwords in the KDE Wallet.
+%endif
 
 %package -n mod_dav_svn
 Group: System Environment/Daemons
@@ -187,7 +191,9 @@ export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path} CFLAGS="$RPM_OPT_FLAGS"
         --enable-javahl \
         --with-junit=%{_prefix}/share/java/junit.jar \
 %endif
+%if %{with_kwallet}
         --with-kwallet \
+%endif
         --with-berkeley-db || (cat config.log; exit 1)
 make %{?_smp_mflags} all
 make swig-py swig-py-lib %{swigdirs}
@@ -279,7 +285,11 @@ export LANG=C LC_ALL=C
 export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
 export MALLOC_PERTURB_=171 MALLOC_CHECK_=3
 export LIBC_FATAL_STDERR_=1
-make check check-swig-pl check-swig-py CLEANUP=yes
+if ! make check check-swig-pl check-swig-py CLEANUP=yes; then
+   : Test suite failure.
+   cat fails.log
+   exit 1
+fi
 # check-swig-rb omitted: it runs svnserve
 %if %{with_java}
 make check-javahl
@@ -348,9 +358,11 @@ fi
 %defattr(-,root,root)
 %{_libdir}/libsvn_auth_gnome_keyring-*.so.*
 
+%if %{with_kwallet}
 %files kde
 %defattr(-,root,root)
 %{_libdir}/libsvn_auth_kwallet-*.so.*
+%endif
 
 %files devel
 %defattr(-,root,root)
@@ -388,6 +400,10 @@ fi
 %endif
 
 %changelog
+* Mon Nov 28 2011 Joe Orton <jorton@redhat.com> - 1.7.1-1
+- update to 1.7.1
+- (temporarily) disable failing kwallet support
+
 * Sun Nov 27 2011 Ville Skyttä <ville.skytta@iki.fi> - 1.7.0-3
 - Build with libmagic support.