From 1dcc4823507df177bf11ca60ab7da988205139b1 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Tue, 26 Feb 2019 12:37:28 +1030
Subject: [PATCH] Update CHANGELOG.md for -rc2.

And fix trivial typo in MAKING-RELEASES.md, and date retreival in
build-release.sh and repro-build.sh (real git tags start with v!)

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 CHANGELOG.md           | 4 ++--
 doc/MAKING-RELEASES.md | 2 +-
 tools/build-release.sh | 3 ++-
 tools/repro-build.sh   | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 633ed7402..dbba11275 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.7.0-rc1]
+## [0.7.0rc2] - 2019-02-26
 
 ### Added
 
@@ -309,7 +309,7 @@ There predate the BOLT specifications, and are only of vague historic interest:
 6. [0.5.1] - 2016-10-21
 7. [0.5.2] - 2016-11-21: "Bitcoin Savings & Trust Daily Interest II"
 
-[0.7.0-rc1]: https://github.com/ElementsProject/lightning/compare/v0.6.3...HEAD
+[0.7.0-rc2]: https://github.com/ElementsProject/lightning/compare/v0.6.3...HEAD
 [0.6.3]: https://github.com/ElementsProject/lightning/releases/tag/v0.6.3
 [0.6.2]: https://github.com/ElementsProject/lightning/releases/tag/v0.6.2
 [0.6.1]: https://github.com/ElementsProject/lightning/releases/tag/v0.6.1
diff --git a/doc/MAKING-RELEASES.md b/doc/MAKING-RELEASES.md
index 0772e3791..c1b687753 100644
--- a/doc/MAKING-RELEASES.md
+++ b/doc/MAKING-RELEASES.md
@@ -13,7 +13,7 @@ Here's a checklist for the release process.
 
 ### Prepering for -rc1
 
-1. Check that CHANGELOG.md is well formetted, ordered in areas,
+1. Check that CHANGELOG.md is well formatted, ordered in areas,
    covers all signficant changes, and sub-ordered approximately by user impact
    & coolness.
 2. Update the CHANGELOG.md with [Unreleased] changed to -rc1, and add a new
diff --git a/tools/build-release.sh b/tools/build-release.sh
index 0986978dd..1a21ca925 100755
--- a/tools/build-release.sh
+++ b/tools/build-release.sh
@@ -64,7 +64,8 @@ if [ "$VERSION" = "" ]; then
     exit 1
 fi
 
-MTIME=${FORCE_MTIME:-$(sed -n "s/^## \\[$VERSION\\] - \\([-0-9]*\\).*/\\1/p" < CHANGELOG.md)}
+# Skip 'v' here in $VERSION
+MTIME=${FORCE_MTIME:-$(sed -n "s/^## \\[${VERSION#v}\\] - \\([-0-9]*\\).*/\\1/p" < CHANGELOG.md)}
 if [ -z "$MTIME" ]; then
     echo "No date found for $VERSION in CHANGELOG.md" >&2
     exit 1
diff --git a/tools/repro-build.sh b/tools/repro-build.sh
index dfc7a932a..4b3e72cf2 100755
--- a/tools/repro-build.sh
+++ b/tools/repro-build.sh
@@ -54,7 +54,8 @@ PLATFORM="$OS"-"$VER"
 VERSION=$(git describe --always --dirty=-modded --abbrev=7 2>/dev/null || pwd | sed -n 's,.*/clightning-\(v[0-9.rc]*\)$,\1,p')
 
 # eg. ## [0.6.3] - 2019-01-09: "The Smallblock Conspiracy"
-MTIME=${FORCE_MTIME:-$(sed -n "s/^## \\[$VERSION\\] - \\([-0-9]*\\).*/\\1/p" < CHANGELOG.md)}
+# Skip 'v' here in $VERSION
+MTIME=${FORCE_MTIME:-$(sed -n "s/^## \\[${VERSION#v}\\] - \\([-0-9]*\\).*/\\1/p" < CHANGELOG.md)}
 if [ -z "$MTIME" ]; then
     echo "No date found for $VERSION in CHANGELOG.md" >&2
     exit 1