rpms/subversion/devel subversion-1.6.6-kwallet.patch, NONE, 1.1 subversion.spec, 1.156, 1.157 subversion-1.6.2-kwallet.patch, 1.1, NONE

[jorton]

Author: jorton

Update of /cvs/extras/rpms/subversion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv634

Modified Files:
	subversion.spec 
Added Files:
	subversion-1.6.6-kwallet.patch 
Removed Files:
	subversion-1.6.2-kwallet.patch 
Log Message:
- fix kwallet patch for fuzz=0


subversion-1.6.6-kwallet.patch:
 kwallet.m4 |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE subversion-1.6.6-kwallet.patch ---

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>


Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- subversion.spec	8 Nov 2009 17:08:47 -0000	1.156
+++ subversion.spec	8 Nov 2009 17:20:22 -0000	1.157
@@ -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


--- subversion-1.6.2-kwallet.patch DELETED ---