rpms/subversion/devel subversion-1.6.2-kwallet.patch, NONE, 1.1 subversion.spec, 1.142, 1.143

[jorton]

Author: jorton

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

Modified Files:
	subversion.spec 
Added Files:
	subversion-1.6.2-kwallet.patch 
Log Message:
* Sun Jun 14 2009 Joe Orton <jorton at redhat.com> 1.6.2-3
- add -gnome, -kde subpackages


subversion-1.6.2-kwallet.patch:

--- NEW FILE subversion-1.6.2-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.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>


Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- subversion.spec	1 Jun 2009 19:34:04 -0000	1.142
+++ subversion.spec	14 Jun 2009 10:04:35 -0000	1.143
@@ -15,7 +15,7 @@
 Summary: A Modern Concurrent Version Control System
 Name: subversion
 Version: 1.6.2
-Release: 2
+Release: 3
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -28,6 +28,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
 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
@@ -61,6 +62,24 @@ The subversion-devel package includes th
 include files for developers interacting with the subversion
 package.
 
+%package gnome
+Group: Development/Tools
+Summary: GNOME Keyring support for Subversion
+Requires: subversion = %{version}-%{release}
+
+%description gnome
+The subversion-gnome package adds support for storing Subversion
+passwords in the GNOME Keyring.
+
+%package kde
+Group: Development/Tools
+Summary: KDE Wallet support for Subversion
+Requires: subversion = %{version}-%{release}
+
+%description kde
+The subversion-kde package adds support for storing Subversion
+passwords in the KDE Wallet.
+
 %package -n mod_dav_svn
 Group: System Environment/Daemons
 Summary: Apache httpd module for Subversion server
@@ -115,6 +134,7 @@ This package includes the Ruby bindings 
 %ifarch sparc64
 sed -i -e 's|-fpie|-fPIE|g' Makefile.in
 %endif
+%patch8 -p1 -b .kwallet
 
 %build
 # Regenerate the buildsystem, so that:
@@ -251,8 +271,16 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/subversion
 %exclude %{_libdir}/libsvn_swig_perl*
 %exclude %{_libdir}/libsvn_swig_ruby*
+%exclude %{_libdir}/libsvn_auth_kwallet*
+%exclude %{_libdir}/libsvn_auth_gnome*
 %exclude %{_mandir}/man*/*::*
 
+%files gnome
+%{_libdir}/libsvn_auth_gnome_keyring-*.so.*
+
+%files kde
+%{_libdir}/libsvn_auth_kwallet-*.so.*
+
 %files devel
 %defattr(-,root,root)
 %{_includedir}/subversion-1
@@ -289,6 +317,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Sun Jun 14 2009 Joe Orton <jorton at redhat.com> 1.6.2-3
+- add -gnome, -kde subpackages
+
 * Mon Jun  1 2009 Joe Orton <jorton at redhat.com> 1.6.2-2
 - enable KWallet, gnome-keyring support