Browse Source

th:


			
			
				rocklinux
			
			
		
Tobias Hintze 18 years ago
parent
commit
609232c9e4
3 changed files with 16 additions and 39 deletions
  1. +0
    -37
      package/base/subversion/neon-newer-version.patch
  2. +13
    -0
      package/base/subversion/subversion.conf
  3. +3
    -2
      package/base/subversion/subversion.desc

+ 0
- 37
package/base/subversion/neon-newer-version.patch

@ -1,37 +0,0 @@
--- ./configure.in.orig 2006-04-19 14:06:13.000000000 +0200
+++ ./configure.in 2006-04-19 14:07:58.000000000 +0200
@@ -227,7 +227,7 @@
# Either a space-separated list of allowable Neon versions, or "any" to
# mean allow anything.
-NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5"
+NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0"
NEON_LATEST_WORKING_VER=0.25.5
NEON_URL="http://www.webdav.org/neon/neon-${NEON_LATEST_WORKING_VER}.tar.gz"
dnl You can skip the neon version check only if you know what you are doing
--- ./build/ac-macros/neon.m4.orig 2006-04-19 14:06:04.000000000 +0200
+++ ./build/ac-macros/neon.m4 2006-04-19 14:07:40.000000000 +0200
@@ -50,9 +50,9 @@
NEON_VERSION=`cat $abs_srcdir/neon/.version`
AC_MSG_RESULT([$NEON_VERSION])
- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.25\.'`" ; then
+ if test -n "`echo \"$NEON_VERSION\" | grep -E '^0\.26\.'`" ; then
AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],
- [Defined if have Neon 0.25.x instead of 0.24.7.])
+ [Defined if have Neon 0.25.x/0.26.x instead of 0.24.7.])
fi
for svn_allowed_neon in $NEON_ALLOWED_LIST; do
@@ -123,9 +123,9 @@
NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'`
AC_MSG_RESULT([$NEON_VERSION])
- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.25\.'`" ; then
+ if test -n "`echo \"$NEON_VERSION\" | grep -E '^0\.26\.'`" ; then
AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],
- [Defined if have Neon 0.25.x instead of 0.24.7.])
+ [Defined if have Neon 0.25.x/0.26.x instead of 0.24.7.])
fi
for svn_allowed_neon in $NEON_ALLOWED_LIST; do

+ 13
- 0
package/base/subversion/subversion.conf

@ -21,9 +21,22 @@
# --- ROCK-COPYRIGHT-NOTE-END ---
autogen=1
autoextract=0
hook_add preconf 5 svn_extract
svn_extract()
{
tar --use-compress-program=bunzip2 -xvf $archdir/subversion-$ver.tar.bz2
tar --use-compress-program=bunzip2 -xvf $archdir/subversion-deps-$ver.tar.bz2
cd subversion-$ver
}
# use system wide neon
pkginstalled neon && var_append extraconfopt " " "--with-neon=$root/usr"
# please double-check this one:
# pkginstalled apache:apr && var_append extraconfopt " " "--with-apr=$root/usr"
pkginstalled sun-jdk14 && var_append extraconfopt " " "--enable-javahl --with-jdk=`ls -d1R $root/opt/j2sdk1.4*`"
if [ "$xpkg" = subversion-static ]

+ 3
- 2
package/base/subversion/subversion.desc

@ -42,10 +42,11 @@
[L] OpenSource
[S] Stable
[V] 1.4.0
[V] 1.4.2
[P] X -?---5---9 193.400
[D] 2222304425 subversion-1.4.0.tar.bz2 http://subversion.tigris.org/tarballs/
[D] 3764204109 subversion-1.4.2.tar.bz2 http://subversion.tigris.org/tarballs/
[D] 2110361189 subversion-deps-1.4.2.tar.bz2 http://subversion.tigris.org/tarballs/
[CV-URL] http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=260

Loading…
Cancel
Save