From 68cfbf3061a17f57f211e13e96a08486bc97634e Mon Sep 17 00:00:00 2001
From: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
Date: Mon, 1 Dec 2025 14:14:58 -0600
Subject: [PATCH] prepare for 2.5 release

---
 RELEASE_PROCEDURE      |  2 +-
 htgettoken.spec        | 27 ++++++++++++++-------------
 htgettoken/__init__.py |  2 +-
 setup.cfg              |  2 +-
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/RELEASE_PROCEDURE b/RELEASE_PROCEDURE
index fcf31b9..ccf6038 100644
--- a/RELEASE_PROCEDURE
+++ b/RELEASE_PROCEDURE
@@ -1,4 +1,4 @@
-1. Update the version in htgettoken and setup.cfg.
+1. Update the version in htgettoken/__init__.py and setup.cfg.
 2. Update the version in htgettoken.spec and add a changelog entry.
 3. Run 'make' to update html version of man page if the man page source
     has changed.
diff --git a/htgettoken.spec b/htgettoken.spec
index f43a74a..ee1feb4 100644
--- a/htgettoken.spec
+++ b/htgettoken.spec
@@ -1,6 +1,6 @@
 Summary: Get OIDC bearer tokens by interacting with Hashicorp vault
 Name: htgettoken
-Version: 2.4
+Version: 2.5
 Release: 1%{?dist}
 
 License: BSD-3-Clause
@@ -74,18 +74,19 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-# - Add htdestroytoken -f option to force a removal of a refresh token in
-#   vault.
-# - Add htgettoken --novaulttoken option as an alias for --noiodc, --nossh,
-#   and --nokerberos.
-# - Again fix --showbearerurl to work in combination with --nobearertoken.
-#   That was fixed in 1.17 but broke in 1.21 and 2.0.
-# - Fix httokensh to pay attention to htgettoken options in $HTGETTOKENOPTS.
-# - Fix httokensh to correctly locate the log file if a -o or --outfile
-#   is given, instead of writing to ".log" in the current directory.
-# - Fix httokensh to not pass on a --vaulttokenminttl option to the background
-#   htgettoken command, to make the vault token last as long as possible since
-#   it doesn't get renewed.
+* Mon Dec  1 2025 Dave Dykstra <dwd@fnal.gov> 2.5-1
+- Add htdestroytoken -f option to force a removal of a refresh token in
+  vault.
+- Add htgettoken --novaulttoken option as an alias for --noiodc, --nossh,
+  and --nokerberos.
+- Again fix --showbearerurl to work in combination with --nobearertoken.
+  That was fixed in 1.17 but broke in 1.21 and 2.0.
+- Fix httokensh to pay attention to htgettoken options in $HTGETTOKENOPTS.
+- Fix httokensh to correctly locate the log file if a -o or --outfile
+  is given, instead of writing to ".log" in the current directory.
+- Fix httokensh to not pass on a --vaulttokenminttl option to the background
+  htgettoken command, to make the vault token last as long as possible since
+  it doesn't get renewed.
 
 * Fri Jun 20 2025 Dave Dykstra <dwd@fnal.gov> 2.4-1
 - Add the new -s and -f options to the htdecodetoken usage summary.
diff --git a/htgettoken/__init__.py b/htgettoken/__init__.py
index 6e8c58f..7156095 100644
--- a/htgettoken/__init__.py
+++ b/htgettoken/__init__.py
@@ -15,7 +15,7 @@
 from __future__ import print_function
 
 prog = "htgettoken"
-version = "2.4"
+version = "2.5"
 
 import os
 import sys
diff --git a/setup.cfg b/setup.cfg
index a0cc0e8..265118e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = htgettoken
-version = 2.4
+version = 2.5
 author = Dave Dykstra
 author_email = dwd@fnal.gov
 license = BSD-3-Clause