From ff701720c84bd28c428b46678bbcde76f966d5cc Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Mon, 1 Jan 2024 17:57:25 -0800
Subject: [PATCH] Fix sphinx's conf.py to handle SCons versions like
 4.6.0.post1

---
 CHANGES.txt        | 12 +++++++++---
 RELEASE.txt        |  4 ++--
 doc/sphinx/conf.py |  5 +++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5a9d9e345a..0d7f94b2d8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,14 @@ NOTE: The 4.0.0 Release of SCons dropped Python 2.7 Support
 NOTE: 4.3.0 now requires Python 3.6.0 and above. Python 3.5.x is no longer supported
 
 RELEASE  VERSION/DATE TO BE FILLED IN LATER
+
+  From Ataf Fazledin Ahamed:
+    - Use of NotImplemented instead of NotImplementedError for special methods
+      of _ListVariable class
+
+  From William Deegan:
+    - Fix sphinx config to handle SCons versions with post such as: 4.6.0.post1
+
   From Michał Górny:
     - Remove unecessary dependencies on pypi packages from setup.cfg
 
@@ -15,9 +23,7 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - Fix of the --debug=sconscript option to return exist statements when using return
       statement with stop flag enabled
 
-  From Ataf Fazledin Ahamed:
-    - Use of NotImplemented instead of NotImplementedError for special methods
-      of _ListVariable class
+
 
 RELEASE 4.6.0 -  Sun, 19 Nov 2023 17:22:20 -0700
 
diff --git a/RELEASE.txt b/RELEASE.txt
index 7599d43fd0..cdf6940846 100644
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -56,10 +56,10 @@ DOCUMENTATION
 DEVELOPMENT
 -----------
 
-- List visible changes in the way SCons is developed
+- Fix sphinx config to handle SCons versions with post such as: 4.6.0.post1
 
 Thanks to the following contributors listed below for their contributions to this release.
 ==========================================================================================
 .. code-block:: text
 
-    git shortlog --no-merges -ns 4.0.1..HEAD
+    git shortlog --no-merges -ns 4.6.0..HEAD
diff --git a/doc/sphinx/conf.py b/doc/sphinx/conf.py
index bf492f0063..8bfdc419e5 100644
--- a/doc/sphinx/conf.py
+++ b/doc/sphinx/conf.py
@@ -98,8 +98,9 @@
 # The full version, including alpha/beta/rc tags:
 release = __version__
 # The short X.Y version.
-major, minor, _ = __version__.split('.')
-version = '.'.join([major, minor])
+version_parts = __version__.split('.')
+major, minor, patch = version_parts[0:3]
+version = '.'.join([major, minor,patch])
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.