From 17e3cb142d2592ce09c4530267ee2fb6ee1c6f79 Mon Sep 17 00:00:00 2001
From: Regina Obe <lr@pcorp.us>
Date: Sat, 11 Nov 2023 18:53:34 -0500
Subject: [PATCH] Prep for 3.11.3 release

---
 HOWTO_RELEASE | 40 ++++++++++++++++++++++++++--------------
 NEWS.md       |  3 ++-
 Version.txt   |  2 +-
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/HOWTO_RELEASE b/HOWTO_RELEASE
index 9cda289120..e413bceab5 100644
--- a/HOWTO_RELEASE
+++ b/HOWTO_RELEASE
@@ -1,4 +1,5 @@
-1. Verify that the versions currently set in Version.txt make sense for this release. See file for instructions.
+1. Verify that the versions currently set in Version.txt
+   make sense for this release. See file for instructions.
 
     - GEOS_VERSION_PATCH
     - GEOS_VERSION_MINOR
@@ -20,29 +21,40 @@
    $ ctest --output-on-failure .
    $ cmake --build . --target distcheck
 
-4. Update the NEWS file (extract most important things from the
-   repository log). Make sure to update the release date.
+4. Update the NEWS file (extract most important things from the repository log). 
+   Make sure to update the release date.
 
-5. Commit and push the changes in the NEWS and Versions.txt files.
+5. Commit the changes in the NEWS file.
+   Push changes with:  git push origin,
+   and confirm all bots are green before moving forward
 
 6. Tag the release:
 
    $ git tag MAJOR.MINOR.PATCH
    $ git push origin MAJOR.MINOR.PATCH
 
-7. Wait for the release build to complete on github,
-   then copy the tarball artifact from github to
-   upload.osgeo.org:/osgeo/download/geos
+7. At this point the github/release.yml action should run, 
+   wait for it to finish and then verify you can build with it.
 
-8. Update web page Download section
+   $ VERSION=MAJOR.MINOR.PATCH
+   $ wget https://github.com/libgeos/geos/releases/download/$VERSION/geos-$VERSION.tar.bz2
+   $ tar xvfz geos-$VERSION.tar.bz2
+   $ cd geos-$VERSION
+   $ mkdir _build && cd _build && cmake ..
+   $ cmake --build .
+   $ ctest --output-on-failure .
 
-    - Add latest release
-    - Remove previous patch level release (if any)
+8. Copy the tar.bz2 tarball to upload.osgeo.org:/osgeo/download/geos
 
-9. Close current github milestone and add new one for next release
+9. Create and push a release branch if this was a PATCH=0 release,
+    update the versions for next release in Version.txt (both in
+    main and release branch).
 
-10. Announce on geos-devel
+10. Update download page in main branch: web/content/usage/download.md
+
+    - Add latest release
+    - Remove previous patch level release (if any)
 
-11. Bump the Versions.txt versions forward to the next dev
-    version, and add a new empty release section to NEWS.
+11. Close current GitHub milestone and add a new one for next release.
 
+12. Announce on geos-devel
\ No newline at end of file
diff --git a/NEWS.md b/NEWS.md
index af43f09880..6241fd7ac2 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,5 @@
 ## Changes in 3.11.3
-2023-xx-xx
+2023-11-11
 
 - Fixes/Improvements:
   - Tri: add exceptions for invalid indexes (GH-853, Martin Davis)
@@ -14,6 +14,7 @@
   - Fix InteriorPointPoint to handle empty elements (GH-977, Martin Davis)
   - PreparedLineStringIntersects: Fix incorrect result with mixed-dim collection with points (GH-774, Dan Baston)
   - Skip over testing empty distances for mixed collections (GH-979, Paul Ramsey)
+  - geosop: change output to show Z (Mike Taves)
 
 ## Changes in 3.11.2
 2023-03-16
diff --git a/Version.txt b/Version.txt
index 902d8d9e21..d4794ea6da 100644
--- a/Version.txt
+++ b/Version.txt
@@ -5,7 +5,7 @@ GEOS_VERSION_MINOR=11
 GEOS_VERSION_PATCH=3
 
 # OPTIONS: "", "dev", "rc1" etc.
-GEOS_PATCH_WORD=dev
+GEOS_PATCH_WORD=
 
 # GEOS CAPI Versions
 #