From d47b5d6c529045e83046201ac12c48b074b332a9 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Fri, 4 Jan 2013 15:07:44 +0000
Subject: [PATCH] update to 1.7.8

---
 .gitignore                           |  1 +
 sources                              |  2 +-
 subversion-1.7.5-kwallet-gcc47.patch | 44 ----------------------------
 subversion.spec                      | 12 ++++----
 4 files changed, 9 insertions(+), 50 deletions(-)
 delete mode 100644 subversion-1.7.5-kwallet-gcc47.patch

diff --git a/.gitignore b/.gitignore
index c17ed63..1c40ac1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ subversion-1.6.12.tar.bz2
 /subversion-1.7.5.tar.bz2
 /subversion-1.7.6.tar.bz2
 /subversion-1.7.7.tar.bz2
+/subversion-1.7.8.tar.bz2
diff --git a/sources b/sources
index 7de8040..652386a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5a42b7d0f1366a8d60f9ad7d5890295d  subversion-1.7.7.tar.bz2
+454b9f398415c3504435bf8c3f6ed127  subversion-1.7.8.tar.bz2
diff --git a/subversion-1.7.5-kwallet-gcc47.patch b/subversion-1.7.5-kwallet-gcc47.patch
deleted file mode 100644
index f718a0b..0000000
--- a/subversion-1.7.5-kwallet-gcc47.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp	2012/06/03 18:50:48	1345739
-+++ subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp	2012/06/03 18:54:26	1345740
-@@ -60,6 +60,9 @@
- /* KWallet simple provider, puts passwords in KWallet                    */
- /*-----------------------------------------------------------------------*/
- 
-+static int q_argc = 1;
-+static char q_argv0[] = "svn"; // Build non-const char * from string constant
-+static char *q_argv[] = { q_argv0 };
- 
- static const char *
- get_application_name(apr_hash_t *parameters,
-@@ -212,12 +215,11 @@
-   QCoreApplication *app;
-   if (! qApp)
-     {
--      int argc = 1;
--      app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
-+      int argc = q_argc;
-+      app = new QCoreApplication(argc, q_argv);
-     }
- 
--  KCmdLineArgs::init(1,
--                     (char *[1]) {(char *) "svn"},
-+  KCmdLineArgs::init(q_argc, q_argv,
-                      get_application_name(parameters, pool),
-                      "subversion",
-                      ki18n(get_application_name(parameters, pool)),
-@@ -289,12 +291,11 @@
-   QCoreApplication *app;
-   if (! qApp)
-     {
--      int argc = 1;
--      app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
-+      int argc = q_argc;
-+      app = new QCoreApplication(argc, q_argv);
-     }
- 
--  KCmdLineArgs::init(1,
--                     (char *[1]) {(char *) "svn"},
-+  KCmdLineArgs::init(q_argc, q_argv,
-                      get_application_name(parameters, pool),
-                      "subversion",
-                      ki18n(get_application_name(parameters, pool)),
diff --git a/subversion.spec b/subversion.spec
index aa717e2..ae62719 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -25,7 +25,7 @@
 
 Summary: A Modern Concurrent Version Control System
 Name: subversion
-Version: 1.7.7
+Version: 1.7.8
 Release: 1%{?dist}
 License: ASL 2.0
 Group: Development/Tools
@@ -44,7 +44,6 @@ Patch3: subversion-1.7.0-kwallet.patch
 Patch4: subversion-1.7.2-ruby19.patch
 Patch7: subversion-1.7.4-kwallet2.patch
 Patch8: subversion-1.7.4-sqlitever.patch
-Patch9: subversion-1.7.5-kwallet-gcc47.patch
 BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
 BuildRequires: %{dbdevel} >= 4.1.25, swig >= 1.3.24, gettext
 BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
@@ -183,7 +182,6 @@ This package includes supplementary tools for use with Subversion.
 %patch4 -p1 -b .ruby
 %patch7 -p1 -b .kwallet2
 %patch8 -p1 -b .sqlitever
-%patch9 -p2 -b .kwallet-gcc47
 
 %build
 # Regenerate the buildsystem, so that:
@@ -213,6 +211,7 @@ export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path} CFLAGS="$RPM_OPT_FLAGS"
         --with-apxs=%{_httpd_apxs} --disable-mod-activation \
         --disable-static --with-sasl=%{_prefix} \
         --disable-neon-version-check \
+        --with-libmagic=%{_prefix} \
         --with-gnome-keyring \
 %if %{with_java}
         --enable-javahl \
@@ -336,8 +335,8 @@ cat %{name}.lang exclude.tools.files >> %{name}.files
 %check
 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
+export MALLOC_PERTURB_=171 MALLOC_CHECK_=3
+export LIBC_FATAL_STDERR_=1
 if ! make check check-swig-pl check-swig-py CLEANUP=yes; then
    : Test suite failure.
    cat fails.log
@@ -479,6 +478,9 @@ fi
 %endif
 
 %changelog
+* Fri Jan  4 2013 Joe Orton <jorton@redhat.com> - 1.7.8-1
+- update to 1.7.8
+
 * Thu Oct 11 2012 Joe Orton <jorton@redhat.com> - 1.7.7-1
 - update to 1.7.7