From 55ca5fbc61fa00e266e325d9b9233b09abcf52f2 Mon Sep 17 00:00:00 2001 From: jorton Date: Sun, 8 Nov 2009 17:20:22 +0000 Subject: [PATCH] - fix kwallet patch for fuzz=0 --- ...-1.6.2-kwallet.patch => subversion-1.6.6-kwallet.patch | 8 ++++---- subversion.spec | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) rename subversion-1.6.2-kwallet.patch => subversion-1.6.6-kwallet.patch (87%) diff --git a/subversion-1.6.2-kwallet.patch b/subversion-1.6.6-kwallet.patch similarity index 87% rename from subversion-1.6.2-kwallet.patch rename to subversion-1.6.6-kwallet.patch index 471b7c8..f9de586 100644 --- a/subversion-1.6.2-kwallet.patch +++ b/subversion-1.6.6-kwallet.patch @@ -3,10 +3,10 @@ The first half of this is certainly upstream-worthy, but the second half is pres some Fedora-specific KDE packaging thing. It's not obvious how to get kde4-config to report the directory which contains the .so files. ---- subversion-1.6.2/build/ac-macros/kwallet.m4.kwallet -+++ subversion-1.6.2/build/ac-macros/kwallet.m4 -@@ -45,14 +45,14 @@ AC_DEFUN(SVN_LIB_KWALLET, - CPPFLAGS="$CPPFLAGS $d" +--- subversion-1.6.6/build/ac-macros/kwallet.m4.kwallet ++++ subversion-1.6.6/build/ac-macros/kwallet.m4 +@@ -47,14 +47,14 @@ AC_DEFUN(SVN_LIB_KWALLET, + fi done qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`" - kde_dir="`$kde4_config --prefix`" diff --git a/subversion.spec b/subversion.spec index a9d8727..fb17988 100644 --- a/subversion.spec +++ b/subversion.spec @@ -32,7 +32,7 @@ Patch2: subversion-1.6.0-deplibs.patch Patch3: subversion-1.6.1-rpath.patch Patch6: subversion-1.6.0-pie.patch Patch7: subversion-1.1.3-java.patch -Patch8: subversion-1.6.2-kwallet.patch +Patch8: subversion-1.6.6-kwallet.patch BuildRequires: autoconf, libtool, python, python-devel, texinfo, which BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0