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: 16-Aug-2005 10:11:47
Branch: OPENPKG_2_4_SOLID Handle: 2005081609114700
Modified files: (Branch: OPENPKG_2_4_SOLID)
openpkg-src/subversion subversion.patch subversion.spec
Log:
MFC: use bundled Neon 0.24.7 because the external Neon 0.25 is API
incompatible and is rejected by Subversion
Summary:
Revision Changes Path
1.11.2.1 +14 -0 openpkg-src/subversion/subversion.patch
1.93.2.2 +6 -4 openpkg-src/subversion/subversion.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/subversion/subversion.patch
============================================================================
$ cvs diff -u -r1.11 -r1.11.2.1 subversion.patch
--- openpkg-src/subversion/subversion.patch 26 May 2005 19:34:26 -0000
1.11
+++ openpkg-src/subversion/subversion.patch 16 Aug 2005 08:11:47 -0000
1.11.2.1
@@ -165,3 +165,17 @@
LDFLAGS="@LDFLAGS@"
SVN_SOURCE_DIR="@abs_srcdir@"
+--- configure.orig Fri Jul 1 22:18:48 2005
++++ configure Fri Aug 5 17:18:33 2005
+@@ -19775,6 +19775,11 @@
+ ac_sub_cache_file="$ac_dots$cache_file" ;;
+ esac
+
++ args="$args --prefix=$prefix/libexec/subversion/neon"
++ if [ ".$with_ssl" = .yes ]; then
++ args="$args --with-ssl"
++ fi
++
+ # The eval makes quoting arguments work.
+ if eval $SHELL $ac_abs_srcdir/configure $ac_configure_args
--cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir $args
+ then :
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/subversion/subversion.spec
============================================================================
$ cvs diff -u -r1.93.2.1 -r1.93.2.2 subversion.spec
--- openpkg-src/subversion/subversion.spec 15 Jun 2005 19:06:32 -0000
1.93.2.1
+++ openpkg-src/subversion/subversion.spec 16 Aug 2005 08:11:47 -0000
1.93.2.2
@@ -38,7 +38,7 @@
Group: SCM
License: Apache/BSD
Version: %{V_opkg}
-Release: 2.4.0
+Release: 2.4.1
# package options
%option with_cvs2svn no
@@ -59,8 +59,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 2.4.0, make, libtool, sed
PreReq: OpenPKG, openpkg >= 2.4.0
-BuildPreReq: diffutils, libxml, db, openssl, zlib, neon
-PreReq: diffutils, libxml, db, openssl, zlib, neon
+BuildPreReq: diffutils, libxml, db, openssl, zlib
+PreReq: diffutils, libxml, db, openssl, zlib
%if "%{with_cvs2svn}" == "yes"
PreReq: rcs, python
%endif
@@ -142,7 +142,7 @@
./configure \
--prefix=%{l_prefix} \
--with-berkeley-db=%{l_prefix} \
- --with-neon=%{l_prefix} \
+ --with-ssl \
--with-zlib \
--enable-static \
%if "%{with_perl}" == "yes" || "%{with_python}" == "yes"
@@ -211,6 +211,8 @@
# strip down installation
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/apr-config
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/apr.exp
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/subversion/neon
+ rmdir $RPM_BUILD_ROOT%{l_prefix}/libexec/subversion >/dev/null 2>&1 ||
true
rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/apr-0
rm -f $RPM_BUILD_ROOT%{l_prefix}/include/subversion-1/svn-revision.txt
rm -f $RPM_BUILD_ROOT%{l_prefix}/include/subversion-1/mod_dav_svn.h
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
