From: Wayne Davison <wayne@opencoder.net>
Date: Tue, 2 Aug 2022 01:43:11 +0000 (-0700)
Subject: Tweaks to allow for a release.
X-Git-Tag: v3.2.5pre1~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e33586359a1e1cce943651e9c60adfe9e65ba54;p=thirdparty%2Frsync.git

Tweaks to allow for a release.
---

diff --git a/NEWS.md b/NEWS.md
index 9ef41b3f..bf7d400a 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4522,7 +4522,7 @@
 
 | RELEASE DATE | VER.   | DATE OF COMMIT\* | PROTOCOL    |
 |--------------|--------|------------------|-------------|
-| ?? ??? ????  | 3.2.5  |                  | 31          |
+| ?? Aug 2022  | 3.2.5  |                  | 31          |
 | 15 Apr 2022  | 3.2.4  |                  | 31          |
 | 06 Aug 2020  | 3.2.3  |                  | 31          |
 | 04 Jul 2020  | 3.2.2  |                  | 31          |
diff --git a/packaging/release-rsync b/packaging/release-rsync
index d484628c..5e54d06e 100755
--- a/packaging/release-rsync
+++ b/packaging/release-rsync
@@ -193,7 +193,9 @@ About to:
         with open(fn, 'r', encoding='utf-8') as fh:
             old_txt = txt = fh.read()
         if fn == 'version.h':
-            txt = f'#define RSYNC_VERSION "{version}"\n'
+            x_re = re.compile(r'^(#define RSYNC_VERSION).*', re.M)
+            msg = f"Unable to update RSYNC_VERSION in {fn}"
+            txt = replace_or_die(x_re, r'\1 "%s"' % version, txt, msg)
         elif '.spec' in fn:
             for var, val in specvars.items():
                 x_re = re.compile(r'^%s .*' % re.escape(var), re.M)