Merge pull request #1019 from NagiosEnterprises/bb_revertingTextChang…

…esfromMasterMerge

Fixing/reverting Text from master merge

BUILDING.rst

@@ -45,10 +45,10 @@ Building on CentOS 7 is the easiest way to get a working package for all Linux d
 
 In most cases, building on the distribution that is targeted, e.g. building on Ubuntu 20.04 to deploy on Ubuntu 20.04, will work, but the resulting package will not be as portable.
 
-To start, clone the repository in your directory:
+To start, clone the repository in your directory::
 
    cd ~
-   git clone https://github.com/NagiosEnterprises/ncpa<<<<<<< HEAD
+   git clone https://github.com/NagiosEnterprises/ncpa
 
 Now run the setup scripts to install the requirements::
 
@@ -62,19 +62,23 @@ the system and build the ncpa binary.
 **Install on the target Linux server**
 --------------------------------
 
-Copy the resulting ~/ncpa/build/ncpa-3.x.x-x.x86_64.rpm or ncpa_3.x.x-x_amd64.deb to the desired server and install using the appropriate package system:
+Copy the resulting ~/ncpa/build/ncpa-3.0.0-latest.x86_64.rpm or ncpa_3.0.0-latest_amd64.deb to the desired server and install using the appropriate package system:
 
-  On CentOs/RHEL::
+  On CentOS/RHEL/Oracle/Amazon/Rocky::
 
-    yum install ./ncpa-3.x.x-1.elx.x86_64.rpm
+    yum install ./ncpa-3.0.0-latest.x86_64.rpm
 
-  On Ubuntu/Debian::
+  On Ubuntu 16+/Debian 9+::
 
-    apt install ./ncpa_3.0.0-1._amd64.deb
+    apt install ./ncpa_3.0.0-latest._amd64.deb
+
+  On Ubuntu 14/Debian 8 (not supported, but may work)::
+
+    dpkg --force-depends -i ./ncpa_3.0.0-latest._amd64.deb
 
   On OpenSuSE/SLES::
 
-    zypper install ./ncpa_3.0.0-1.x86_64.deb
+    zypper install ./ncpa-3.0.0-latest.x86_64.rpm
 
 
 Building on MacOS

README.rst

@@ -15,11 +15,9 @@ Downloads
 
 Current versions:
 
-+---------+-------------+------------------------------------------------------------+
-| Current | **2.4.1**   | `Downloads <https://www.nagios.org/ncpa/#downloads>`_      |
-+---------+-------------+------------------------------------------------------------+
-| Beta    | **3.0.0**   | `Downloads <https://www.nagios.org/ncpa/#beta-downloads>`_ |
-+---------+-------------+------------------------------------------------------------+
++---------+-------------+-------------------------------------------------------+
+| Current | **3.0.0**   | `Downloads <https://www.nagios.org/ncpa/#downloads>`_ |
++---------+-------------+-------------------------------------------------------+
 
 `Older Versions <https://www.nagios.org/ncpa/archive.php>`_
 

build/build.sh

@@ -190,27 +190,6 @@ if command -v git > /dev/null; then
     echo "GIT_HASH_FILE: $GIT_HASH_FILE"
 fi
 
-# Add file with current GIT hash to build
-GIT_LONG="Not built under GIT"
-GIT_HASH_FILE="NoGIT.githash"
-
-if command -v git > /dev/null; then
-    GIT_LONG=$(git rev-parse HEAD)
-    GIT_SHORT=$(git rev-parse --short HEAD)
-    GIT_UNCOMMITTED=$(git status --untracked-files=no --porcelain)
-    echo "GIT_UNCOMMITTED: $GIT_UNCOMMITTED"
-    if [ "$GIT_UNCOMMITTED" ]; then
-        GIT_LONG="$GIT_LONG++  compiled with uncommitted changes"
-        GIT_SHORT="$GIT_SHORT++"
-    fi
-    GIT_HASH_FILE="git-$GIT_SHORT.githash"
-    echo "GIT_LONG: $GIT_LONG"
-    echo "GIT_SHORT: $GIT_SHORT"
-    echo "GIT_HASH_FILE: $GIT_HASH_FILE"
-fi
-# ls $AGENT_DIR/*.githash >/dev/null && rm $AGENT_DIR/*.githash
-# echo $GIT_LONG > "$AGENT_DIR/$GIT_HASH_FILE"
-
 (
     echo -e "\nBuilding NCPA binaries..."
     cd $AGENT_DIR

build/linux/ncpa.spec

@@ -1,6 +1,6 @@
 Name:           ncpa
 Version:        __VERSION__
-Release:        beta02
+Release:        latest
 Vendor:         Nagios Enterprises, LLC
 Summary:        A cross-platform active and passive monitoring agent
 BuildRoot:      __BUILDROOT__/BUILDROOT/

build/macos/package.sh

@@ -6,7 +6,7 @@ echo -e "\n***** macos/package.sh"
 DIR=$( cd "$(dirname "$0")" ; pwd -P )
 BUILD_DIR="$DIR/.."
 NCPA_VER=$(cat $BUILD_DIR/../VERSION)
-RELEASE="release"
+RELEASE="latest"
 ARCH=$(uname -m)
 
 (