From 55ca5fbc61fa00e266e325d9b9233b09abcf52f2 Mon Sep 17 00:00:00 2001
From: jorton <jorton@fedoraproject.org>
Date: Nov 08 2009 17:20:22 +0000
Subject: - fix kwallet patch for fuzz=0


---

diff --git a/subversion-1.6.2-kwallet.patch b/subversion-1.6.2-kwallet.patch
deleted file mode 100644
index 471b7c8..0000000
--- a/subversion-1.6.2-kwallet.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-
-The first half of this is certainly upstream-worthy, but the second half is presumably
-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"
-                   done
-                   qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`"
--                  kde_dir="`$kde4_config --prefix`"
--                  SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include"
-+                  kde_include_dirs="-I`$kde4_config --path include`"
-+                  SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs $kde_include_dirs"
-                   qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`"
-                   SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options"
-                   CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES"
-                   LIBS="$LIBS $SVN_KWALLET_LIBS"
-                   qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"
--                  LDFLAGS="$old_LDFLAGS $qt_lib_dirs -L$kde_dir/lib`$kde4_config --libsuffix`"
-+                  LDFLAGS="$old_LDFLAGS $qt_lib_dirs -L/usr/lib`$kde4_config --libsuffix`/kde4/devel"
-                   AC_LANG(C++)
-                   AC_LINK_IFELSE([
- #include <kwallet.h>
diff --git a/subversion-1.6.6-kwallet.patch b/subversion-1.6.6-kwallet.patch
new file mode 100644
index 0000000..f9de586
--- /dev/null
+++ b/subversion-1.6.6-kwallet.patch
@@ -0,0 +1,25 @@
+
+The first half of this is certainly upstream-worthy, but the second half is presumably
+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.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`"
+-                  SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include"
++                  kde_include_dirs="-I`$kde4_config --path include`"
++                  SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs $kde_include_dirs"
+                   qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`"
+                   SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options"
+                   CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES"
+                   LIBS="$LIBS $SVN_KWALLET_LIBS"
+                   qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"
+-                  LDFLAGS="$old_LDFLAGS $qt_lib_dirs -L$kde_dir/lib`$kde4_config --libsuffix`"
++                  LDFLAGS="$old_LDFLAGS $qt_lib_dirs -L/usr/lib`$kde4_config --libsuffix`/kde4/devel"
+                   AC_LANG(C++)
+                   AC_LINK_IFELSE([
+ #include <kwallet.h>
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