Explorar o código

subversion is picky about versions hence make it happy by by providing its own neon library with the most wanted version number

Christoph Schug %!s(int64=20) %!d(string=hai) anos
pai
achega
80e0de7912
Modificáronse 2 ficheiros con 22 adicións e 4 borrados
  1. 14 0
      subversion/subversion.patch
  2. 8 4
      subversion/subversion.spec

+ 14 - 0
subversion/subversion.patch

@@ -165,3 +165,17 @@ Index: svn-config.in
  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 :

+ 8 - 4
subversion/subversion.spec

@@ -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 @@ Class:        BASE
 Group:        SCM
 License:      Apache/BSD
 Version:      %{V_opkg}
-Release:      20050706
+Release:      20050809
 
 #   package options
 %option       with_cvs2svn  no
@@ -52,6 +53,7 @@ Source1:      ftp://ftp.openpkg.org/sources/CPY/subversion/subversion-tools-%{V_
 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 @@ Prefix:       %{l_prefix}
 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 @@ AutoReqProv:  no
 %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 @@ AutoReqProv:  no
     ./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"