OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Aug-2005 17:15:39
Branch: HEAD Handle: 2005080916153700
Modified files:
openpkg-src/subversion subversion.patch subversion.spec
Log:
subversion is picky about versions hence make it happy by by providing
its own neon library with the most wanted version number
Summary:
Revision Changes Path
1.12 +14 -0 openpkg-src/subversion/subversion.patch
1.96 +8 -4 openpkg-src/subversion/subversion.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/subversion/subversion.patch
============================================================================
$ cvs diff -u -r1.11 -r1.12 subversion.patch
--- openpkg-src/subversion/subversion.patch 26 May 2005 19:34:26 -0000
1.11
+++ openpkg-src/subversion/subversion.patch 9 Aug 2005 15:15:37 -0000
1.12
@@ -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.95 -r1.96 subversion.spec
--- openpkg-src/subversion/subversion.spec 6 Jul 2005 13:56:56 -0000
1.95
+++ openpkg-src/subversion/subversion.spec 9 Aug 2005 15:15:37 -0000
1.96
@@ -26,6 +26,7 @@
%define V_dist 1.2.1
%define V_opkg 1.2.1
%define V_tools 20050706
+%define V_neon 0.24.7
# package information
Name: subversion
@@ -38,7 +39,7 @@
Group: SCM
License: Apache/BSD
Version: %{V_opkg}
-Release: 20050706
+Release: 20050809
# package options
%option with_cvs2svn no
@@ -52,6 +53,7 @@
Source2: subversion.config
Source3: subversion.servers
Source4: rc.subversion
+Source5: http://www.webdav.org/neon/neon-%{V_neon}.tar.gz
Patch0: subversion.patch
# build information
@@ -59,8 +61,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, make, libtool, sed
PreReq: OpenPKG, openpkg >= 20040130
-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
@@ -104,6 +106,8 @@
%prep
%setup -q
%setup -q -T -D -a 1
+ %setup -q -T -D -a 5
+ mv neon-%{V_neon} neon
%patch -p0
# substitute path from applied patch
@@ -142,7 +146,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"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
