[couchdb: 10/10] Ver. 1.0.3

Peter Lemenkov peter at fedoraproject.org
Thu Jul 21 11:43:27 UTC 2011 

commit 688cd05c243320247621eca5291e732b5bd9d96a
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Jul 21 15:42:02 2011 +0400

    Ver. 1.0.3
    
    Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

 .gitignore                    |    1 +
 couchdb-9999-Autoreconf.patch |   52 +++++++++++++++++++++++++++++-----------
 sources                       |    2 +-
 3 files changed, 39 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7ce4a36..3f136bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ apache-couchdb-1.0.1.tar.gz
 /apache-couchdb-1.0.1.tar.gz
 /apache-couchdb-1.0.2.tar.gz
 /apache-couchdb-1.0.3-0-ga5f5eab.tar.gz
+/apache-couchdb-1.0.3.tar.gz
diff --git a/couchdb-9999-Autoreconf.patch b/couchdb-9999-Autoreconf.patch
index b9b86d4..6077a27 100644
--- a/couchdb-9999-Autoreconf.patch
+++ b/couchdb-9999-Autoreconf.patch
@@ -1,6 +1,6 @@
-From c29043add336489bc5eae7e8e8725b6dcbfe76f8 Mon Sep 17 00:00:00 2001
+From a9cd282d33cb14be1fe0721e0b1e26f94e8a7997 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
-Date: Thu, 21 Jul 2011 15:33:40 +0400
+Date: Tue, 12 Jul 2011 12:51:02 +0400
 Subject: [PATCH] Autoreconf
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH] Autoreconf
  build-aux/config.guess       |  142 +-
  build-aux/config.sub         |   30 +-
  build-aux/ltmain.sh          | 3989 +++++++++++++++++++++++++++---------------
- configure                    | 3147 +++++++++++++++++++++------------
+ configure                    | 3155 +++++++++++++++++++++------------
  etc/Makefile.in              |    4 +-
  etc/couchdb/Makefile.in      |    4 +-
  etc/default/Makefile.in      |    4 +-
@@ -33,7 +33,7 @@ Subject: [PATCH] Autoreconf
  test/view_server/Makefile.in |    4 +-
  utils/Makefile.in            |    4 +-
  var/Makefile.in              |    4 +-
- 29 files changed, 6017 insertions(+), 3519 deletions(-)
+ 29 files changed, 6021 insertions(+), 3523 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
 index fc6508d..1215160 100644
@@ -7189,15 +7189,15 @@ index 7ed280b..aa5624c 100755
  if test -n "$exec_cmd"; then
    eval exec "$exec_cmd"
 diff --git a/configure b/configure
-index 5e79be6..05f06a2 100755
+index 4daa0e0..f161c99 100755
 --- a/configure
 +++ b/configure
 @@ -1,12 +1,12 @@
  #! /bin/sh
- # From configure.ac 1.0.3.
+ # From configure.ac 1.0.2.
  # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.65 for Apache CouchDB 1.0.3.
-+# Generated by GNU Autoconf 2.68 for Apache CouchDB 1.0.3.
+-# Generated by GNU Autoconf 2.65 for Apache CouchDB 1.0.2.
++# Generated by GNU Autoconf 2.68 for Apache CouchDB 1.0.2.
  #
  #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -7634,7 +7634,7 @@ index 5e79be6..05f06a2 100755
 @@ -1672,9 +1547,9 @@ test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
- Apache CouchDB configure 1.0.3
+ Apache CouchDB configure 1.0.2
 -generated by GNU Autoconf 2.65
 +generated by GNU Autoconf 2.68
  
@@ -7767,7 +7767,7 @@ index 5e79be6..05f06a2 100755
 @@ -2037,7 +1912,7 @@ This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  
- It was created by Apache CouchDB $as_me 1.0.3, which was
+ It was created by Apache CouchDB $as_me 1.0.2, which was
 -generated by GNU Autoconf 2.65.  Invocation command line was
 +generated by GNU Autoconf 2.68.  Invocation command line was
  
@@ -11566,6 +11566,28 @@ index 5e79be6..05f06a2 100755
    $as_echo_n "(cached) " >&6
  else
    case $CURL_CONFIG in
+@@ -11879,9 +12664,9 @@ fi
+     echo "*** Or see http://curl.haxx.se/"
+   else
+         CURL_VERSION=`$CURL_CONFIG --version | cut -d" " -f2`
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl >= 7.18.0" >&5
+-$as_echo_n "checking for curl >= 7.18.0... " >&6; }
+-        VERSION_CHECK=`expr $CURL_VERSION \>\= 7.18.0`
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl >= 7.15.0" >&5
++$as_echo_n "checking for curl >= 7.15.0... " >&6; }
++        VERSION_CHECK=`expr $CURL_VERSION \>\= 7.15.0`
+         if test "$VERSION_CHECK" = "1" ; then
+             { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+@@ -11903,7 +12688,7 @@ $as_echo "$CURL_LIBS" >&6; }
+             CURL_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but
+             ## do set a variable so people can do so.
+-            echo "can't find curl >= 7.18.0"
++            echo "can't find curl >= 7.15.0"
+         fi
+ 
+ 
 @@ -11913,7 +12698,7 @@ $as_echo "$CURL_LIBS" >&6; }
    if test $succeeded = yes; then
       :
@@ -11846,7 +11868,7 @@ index 5e79be6..05f06a2 100755
 @@ -12874,7 +13672,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  # values after options handling.
  ac_log="
- This file was extended by Apache CouchDB $as_me 1.0.3, which was
+ This file was extended by Apache CouchDB $as_me 1.0.2, which was
 -generated by GNU Autoconf 2.65.  Invocation command line was
 +generated by GNU Autoconf 2.68.  Invocation command line was
  
@@ -11855,7 +11877,7 @@ index 5e79be6..05f06a2 100755
 @@ -12940,10 +13738,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
- Apache CouchDB config.status 1.0.3
+ Apache CouchDB config.status 1.0.2
 -configured by $0, generated by GNU Autoconf 2.65,
 +configured by $0, generated by GNU Autoconf 2.68,
    with options \\"\$ac_cs_config\\"
@@ -17009,7 +17031,7 @@ index 637bb20..c573da9 100644
 +m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
 +m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
 diff --git a/share/Makefile.in b/share/Makefile.in
-index 8992e02..1acc4b7 100644
+index ad2b9f3..f00fa77 100644
 --- a/share/Makefile.in
 +++ b/share/Makefile.in
 @@ -97,6 +97,7 @@ CURL_LIBS = @CURL_LIBS@
@@ -17126,7 +17148,7 @@ index 3db2b7f..1e3d210 100644
  mkdir_p = @mkdir_p@
  msvc_redist_dir = @msvc_redist_dir@
 diff --git a/src/couchdb/priv/Makefile.in b/src/couchdb/priv/Makefile.in
-index a5551a2..1a8993f 100644
+index abccac8..9986f70 100644
 --- a/src/couchdb/priv/Makefile.in
 +++ b/src/couchdb/priv/Makefile.in
 @@ -142,6 +142,7 @@ CURL_LIBS = @CURL_LIBS@
@@ -17234,7 +17256,7 @@ index eefad42..41638f5 100644
  mkdir_p = @mkdir_p@
  msvc_redist_dir = @msvc_redist_dir@
 diff --git a/test/etap/Makefile.in b/test/etap/Makefile.in
-index 306e1e0..d906d30 100644
+index 87b6d7e..05bad91 100644
 --- a/test/etap/Makefile.in
 +++ b/test/etap/Makefile.in
 @@ -74,6 +74,7 @@ CURL_LIBS = @CURL_LIBS@
diff --git a/sources b/sources
index 6c812f9..b4795b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5bcace75c3d28b3003e758138c1774f9  apache-couchdb-1.0.3-0-ga5f5eab.tar.gz
+cfdc2ab751bf18049c5ef7866602d8ed  apache-couchdb-1.0.3.tar.gz

More information about the scm-commits mailing list