[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (ff1b3effdb1127eb0cccc8743d045a9a69c021f1)

Ladislav Hagara scm at sourcemage.org
Thu Oct 22 02:21:03 EDT 2009


GIT changes to master grimoire by Ladislav Hagara <hgr at vabo.cz>:

 collab/subversion/DETAILS                       |    4 ++--
 collab/subversion/HISTORY                       |    5 +++++
 collab/subversion/PRE_BUILD                     |    5 -----
 collab/subversion/neon-1.patch                  |   13 -------------
 collab/subversion/neon-2.patch                  |   11 -----------
 collab/subversion/subversion-apr_cppflags.patch |   13 -------------
 6 files changed, 7 insertions(+), 44 deletions(-)

New commits:
commit ff1b3effdb1127eb0cccc8743d045a9a69c021f1
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    subversion 1.6.6

diff --git a/collab/subversion/DETAILS b/collab/subversion/DETAILS
index 1d81608..6f6cb95 100755
--- a/collab/subversion/DETAILS
+++ b/collab/subversion/DETAILS
@@ -1,5 +1,5 @@
            SPELL=subversion
-         VERSION=1.6.5
+         VERSION=1.6.6
 if [[ "$SVN_HEAD" == y ]]; then VERSION=${VERSION%.*}-HEAD; fi
           SOURCE=$SPELL-$VERSION.tar.bz2
 if [[ "$SVN_HEAD" == y ]]; then
@@ -9,7 +9,7 @@ if [[ "$SVN_HEAD" == y ]]; then
 else
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://subversion.tigris.org/downloads/$SOURCE
-     SOURCE_HASH=sha512:22940161a062cd4154ec88df0b2ef01f7e7fcf978371b8e00f275cf362babf4c2a60bda5f4ac8681dab0e1cbb37829eff9796f5ce7feffd869ca3b97d62ac7a3
+     SOURCE_HASH=sha512:2b2c61d6e3ed379d00120f4cb3a325437bbdd03fb7c779516c1d79e7782f3bcc7889294dc3002efdaeab53bb18962d2c9b329d10d744e30967d3d56951906d01
 fi
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://subversion.tigris.org/
diff --git a/collab/subversion/HISTORY b/collab/subversion/HISTORY
index 5b902e5..f79c676 100644
--- a/collab/subversion/HISTORY
+++ b/collab/subversion/HISTORY
@@ -1,3 +1,8 @@
+2009-10-22 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.6.6
+	* PRE_BUILD, neon-1.patch, neon-2.patch: removed
+	* subversion-apr_cppflags.patch: removed
+
 2009-10-14 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: Uses any provider of LIBSASL
 
diff --git a/collab/subversion/PRE_BUILD b/collab/subversion/PRE_BUILD
deleted file mode 100755
index 862a3de..0000000
--- a/collab/subversion/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p1 < "$SPELL_DIRECTORY/neon-1.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/neon-2.patch"
diff --git a/collab/subversion/neon-1.patch b/collab/subversion/neon-1.patch
deleted file mode 100644
index 808ff83..0000000
--- a/collab/subversion/neon-1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- trunk/configure	2009/09/14 01:54:42	39282
-+++ trunk/configure	2009/09/14 02:26:48	39283
-@@ -86,8 +86,8 @@
- 
- # Either a space-separated list of allowable Neon versions, or "any" to
- # mean allow anything.
--NEON_ALLOWED_LIST="0\.25 0\.26 0\.27\.2 0\.28"
--NEON_RECOMMENDED_VER=0.28.4
-+NEON_ALLOWED_LIST="0\.25 0\.26 0\.27\.2 0\.28 0\.29"
-+NEON_RECOMMENDED_VER="0.29.0"
- NEON_URL="http://www.webdav.org/neon/neon-${NEON_RECOMMENDED_VER}.tar.gz"
- dnl You can skip the neon version check only if you know what you are doing 
- AC_ARG_ENABLE(neon-version-check,
diff --git a/collab/subversion/neon-2.patch b/collab/subversion/neon-2.patch
deleted file mode 100644
index 201e5b8..0000000
--- a/collab/subversion/neon-2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trunk/tools/dist/construct-rolling-environment.sh	2009/09/14 01:54:42	39282
-+++ trunk/tools/dist/construct-rolling-environment.sh	2009/09/14 02:26:48	39283
-@@ -7,7 +7,7 @@
- 
- APR=apr-1.3.5
- APR_UTIL=apr-util-1.3.7
--NEON=neon-0.28.4
-+NEON=neon-0.29.0
- SERF=serf-0.3.0
- ZLIB=zlib-1.2.3
- SQLITE_VERSION=3.6.13
diff --git a/collab/subversion/subversion-apr_cppflags.patch b/collab/subversion/subversion-apr_cppflags.patch
deleted file mode 100644
index c46a251..0000000
--- a/collab/subversion/subversion-apr_cppflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: subversion-1.4.6/build/ac-macros/apr.m4
-===================================================================
---- subversion-1.4.6.orig/build/ac-macros/apr.m4
-+++ subversion-1.4.6/build/ac-macros/apr.m4
-@@ -64,7 +64,7 @@ AC_DEFUN(SVN_LIB_APR,
-     AC_MSG_ERROR([apr-config --ldflags failed])
-   fi
- 
--  SVN_APR_INCLUDES="`$apr_config --includes`"
-+  SVN_APR_INCLUDES="`$apr_config --includes --cppflags`"
-   if test $? -ne 0; then
-     AC_MSG_ERROR([apr-config --includes failed])
-   fi



More information about the SM-Commit mailing list