Hello community, here is the log from the commit of package subversion checked in at Wed Apr 5 17:42:05 CEST 2006. -------- --- subversion/subversion.changes 2006-03-10 14:09:18.000000000 +0100 +++ subversion/subversion.changes 2006-04-04 21:10:55.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 4 21:10:36 CEST 2006 - olh@suse.de + +- add svn-config to subversion-devel package (#163289) + +------------------------------------------------------------------- New: ---- subversion.svn-config.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ subversion.spec ++++++ --- /var/tmp/diff_new_pack.Vy2YVX/_old 2006-04-05 17:41:29.000000000 +0200 +++ /var/tmp/diff_new_pack.Vy2YVX/_new 2006-04-05 17:41:29.000000000 +0200 @@ -13,7 +13,7 @@ Name: subversion BuildRequires: apache2-devel db-devel gcc-c++ java2-devel-packages libapr-util1-devel neon-devel openldap2-devel pcre-devel python-devel swig xorg-x11-devel Version: 1.3.0 -Release: 7 +Release: 11 # %define apxs /usr/sbin/apxs2 %define apache_libexecdir %(%{apxs} -q LIBEXECDIR) @@ -46,6 +46,7 @@ # Patch10: subversion.warning.svn_error_createf.patch Patch11: subversion.libtool-verbose.patch +Patch12: subversion.svn-config.patch # build fixes Patch20: subversion-swig-perl-install_vendor.patch Patch22: subversion-1.1.x-COMPILE_CXX.dif @@ -128,7 +129,7 @@ %package -n cvs2svn Version: 1.3.0 -Release: 17 +Release: 21 Provides: subversion-cvs2svn Obsoletes: subversion-cvs2svn Group: Development/Tools/Version Control @@ -148,7 +149,7 @@ %package -n viewcvs Version: 1.0 -Release: 42 +Release: 46 Requires: subversion-python Provides: subversion-viewcvs Obsoletes: subversion-viewcvs @@ -194,6 +195,7 @@ # %patch10 -p1 %patch11 -p1 +%patch12 -p1 # %patch20 -p1 %patch22 -p1 @@ -312,6 +314,7 @@ with_jdk= fi make DESTDIR=$RPM_BUILD_ROOT install install-swig-pl install-swig-py $with_jdk +cp svn-config $RPM_BUILD_ROOT/usr/bin/ # # double check that the essential repository access schemes have been compiled in # @@ -443,6 +446,7 @@ %{_libdir}/libsvn*.a %{_libdir}/libsvn*.la /usr/include/subversion-1/* +%attr(755,root,root) /usr/bin/svn-config %files -n cvs2svn %defattr(-,root,root) @@ -470,6 +474,8 @@ %config (noreplace) %{apache_sysconfdir}/conf.d/subversion.viewcvs.conf %changelog -n subversion +* Tue Apr 04 2006 - olh@suse.de +- add svn-config to subversion-devel package (#163289) * Fri Mar 10 2006 - poeml@suse.de - fix instructions in README.SuSE * Sun Mar 05 2006 - olh@suse.de ++++++ subversion.svn-config.patch ++++++ Provide a svn-config Bug 163289 - subversion-devel package misses svn-config --- svn-config.in | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) Index: subversion-1.3.x/svn-config.in =================================================================== --- subversion-1.3.x.orig/svn-config.in +++ subversion-1.3.x/svn-config.in @@ -22,14 +22,12 @@ bindir="@bindir@" libdir="@libdir@" includedir="@includedir@" -LIBS="@NEON_LIBS@ @SVN_APRUTIL_EXPORT_LIBS@ @SVN_APR_EXPORT_LIBS@ @SVN_DB_LIBS@ @LIBS@" +LIBS="@NEON_LIBS@ @SVN_APRUTIL_EXPORT_LIBS@ @SVN_APR_EXPORT_LIBS@ @LIBS@" CFLAGS="@CFLAGS@" CPPFLAGS="@CPPFLAGS@" -INCLUDES="@SVN_NEON_INCLUDES@ @SVN_DB_INCLUDES@ @SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@" +INCLUDES="@SVN_NEON_INCLUDES@ @SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@" LDFLAGS="@LDFLAGS@" -SVN_SOURCE_DIR="@abs_srcdir@" -SVN_BUILD_DIR="@abs_builddir@" show_usage() { @@ -43,7 +41,6 @@ Known values for OPTION are: --includes print include information --ldflags print linker flags --libs print library information - --srcdir print SVN source directory --link-ld [NOT IMPL] print link switch(es) for linking to SVN --link-libtool [NOT IMPL] print the libtool inputs for linking to SVN --help print this help @@ -63,21 +60,6 @@ if test $# -eq 0; then exit 1 fi -thisdir="`dirname $0`" -thisdir="`cd $thisdir && pwd`" -if test -d $bindir; then - tmpbindir="`cd $bindir && pwd`" -else - tmpbindir="" -fi -if test "$tmpbindir" = "$thisdir"; then - location=installed -elif test "$SVN_SOURCE_DIR" = "$thisdir"; then - location=source -else - location=build -fi - flags="" while test $# -gt 0; do @@ -106,21 +88,11 @@ while test $# -gt 0; do flags="$flags $LIBS" ;; --includes) - if test "$location" = "installed"; then flags="$flags -I$includedir/subversion-1 $INCLUDES" - elif test "$location" = "source"; then - flags="$flags -I$SVN_SOURCE_DIR/include $INCLUDES" - else - flags="$flags -I$thisdir/include -I$SVN_SOURCE_DIR/include $INCLUDES" - fi ;; --ldflags) flags="$flags $LDFLAGS" ;; - --srcdir) - echo $SVN_SOURCE_DIR - exit 0 - ;; --help) show_usage exit 0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...