OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-Mar-2005 14:26:10
Branch: HEAD Handle: 2005030813260900
Modified files:
openpkg-src/subversion subversion.patch subversion.spec
Log:
fix a typo; remove a blank line; install svn-config script
Summary:
Revision Changes Path
1.9 +20 -0 openpkg-src/subversion/subversion.patch
1.87 +5 -2 openpkg-src/subversion/subversion.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/subversion/subversion.patch
============================================================================
$ cvs diff -u -r1.8 -r1.9 subversion.patch
--- openpkg-src/subversion/subversion.patch 8 Mar 2005 11:05:59 -0000
1.8
+++ openpkg-src/subversion/subversion.patch 8 Mar 2005 13:26:09 -0000
1.9
@@ -144,3 +144,23 @@
ra_local_test_DEPS = subversion/tests/libsvn_ra_local/ra-local-test.o
subversion/tests/libsvn_test-1.la subversion/libsvn_ra/libsvn_ra-1.la
subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_delta/libsvn_delta-1.la
subversion/libsvn_subr/libsvn_subr-1.la
ra_local_test_OBJECTS = ra-local-test.o
+Index: svn-config.in
+--- svn-config.in.orig 2003-12-16 17:41:14 +0100
++++ svn-config.in 2005-03-08 14:07:56 +0100
+@@ -22,10 +22,14 @@
+ libdir="@libdir@"
+ includedir="@includedir@"
+
+-LIBS="@NEON_LIBS@ @SVN_APRUTIL_EXPORT_LIBS@ @SVN_APR_EXPORT_LIBS@
@SVN_DB_LIBS@ @LIBS@"
++SVN_LIBS=""
++for name in client repos delta diff wc ra ra_local ra_dav ra_svn fs fs_base
fs_fs subr; do
++ SVN_LIBS="$SVN_LIBS -lsvn_${name}-1"
++done
++LIBS="$SVN_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@"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/subversion/subversion.spec
============================================================================
$ cvs diff -u -r1.86 -r1.87 subversion.spec
--- openpkg-src/subversion/subversion.spec 8 Mar 2005 12:56:18 -0000
1.86
+++ openpkg-src/subversion/subversion.spec 8 Mar 2005 13:26:09 -0000
1.87
@@ -175,10 +175,9 @@
$RPM_BUILD_ROOT/%{l_prefix}/include/subversion-1/svn*.h
( cd $RPM_BUILD_ROOT%{l_prefix}/lib
for i in libapr*; do
- mv $i `echo "$i" | sed -e 's;^libapr\(.*\)$;libsnv_apr\1;'`
+ mv $i `echo "$i" | sed -e 's;^libapr\(.*\)$;libsvn_apr\1;'`
done
) || exit $?
-
%if "%{with_perl}" == "yes"
%{l_make} %{l_mflags} install-swig-pl DESTDIR=$RPM_BUILD_ROOT
%endif
@@ -207,6 +206,10 @@
$RPM_BUILD_ROOT%{l_prefix}/lib/python
%endif
+ # install svn-config(1) tool
+ %{l_shtool} install -c -m 755 \
+ svn-config $RPM_BUILD_ROOT%{l_prefix}/bin/
+
# install svn_load_dirs(1) tool
%{l_shtool} install -c -m 755 \
-e 's;#!/usr/bin/perl;#!%{l_prefix}/bin/perl;' \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
