From 5d8f1ffaef18b48d4616f563b71cf73c4b377a9c Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Jul 31 2020 02:02:53 +0000
Subject: Merge branch 'epel8' into epel8-playground


---

diff --git a/cmake-build b/cmake-build
index 4a9962f..138ff5f 100755
--- a/cmake-build
+++ b/cmake-build
@@ -2,7 +2,7 @@
 # Shell wrapper for supporting compiling with different backends for CMake < 3.13
 
 # Collect arguments
-__cmake_builddir="$1"
+__cmake_builddir="$(realpath $1)"
 __build_flags="${@:2}"
 
 if [ -f "${__cmake_builddir}/Makefile" ]; then
diff --git a/cmake-configure b/cmake-configure
index adbc2ea..da0bace 100755
--- a/cmake-configure
+++ b/cmake-configure
@@ -3,11 +3,15 @@
 
 # Collect arguments
 __cmake="$1"
-__cmake_srcdir="$2"
-__cmake_builddir="$3"
+__cmake_srcdir="$(realpath $2)"
+__cmake_builddir="$(realpath $3)"
 __cmake_flags="${@:4}"
+__cmake_retval=0
 
 # Do the build
 mkdir -p "${__cmake_builddir}"
-"${__cmake}" ${__cmake_flags} "${__cmake_srcdir}" "${__cmake_builddir}"
-exit $?
+pushd "${__cmake_builddir}"
+"${__cmake}" ${__cmake_flags} "${__cmake_srcdir}"
+__cmake_retval=$?
+popd
+exit ${__cmake_retval}
diff --git a/cmake-install b/cmake-install
index f3cbcb8..104b035 100755
--- a/cmake-install
+++ b/cmake-install
@@ -2,7 +2,7 @@
 # Shell wrapper for supporting installing with different backends for CMake < 3.13
 
 # Collect arguments
-__cmake_builddir="$1"
+__cmake_builddir="$(realpath $1)"
 __cmake_destdir="$2"
 
 if [ -f "${__cmake_builddir}/Makefile" ]; then
diff --git a/epel-rpm-macros.spec b/epel-rpm-macros.spec
index b4c50ce..c92a301 100644
--- a/epel-rpm-macros.spec
+++ b/epel-rpm-macros.spec
@@ -1,6 +1,6 @@
 Name:           epel-rpm-macros
 Version:        8
-Release:        15.playground
+Release:        16
 Summary:        Extra Packages for Enterprise Linux RPM macros
 
 Group:          System Environment/Base
@@ -83,6 +83,9 @@ install -Dpm 755 %{SOURCE24} \
 
 
 %changelog
+* Thu Jul 30 2020 Neal Gompa <ngompa13@gmail.com> - 8-16
+- Use legacy behavior for cmake-configure
+
 * Wed Jul 29 2020 Neal Gompa <ngompa13@gmail.com> - 8-15
 - Backport support for out-of-source builds controlled by __cmake_in_source_build macro (#1861329)
 - Backport cmake_build and cmake_install macros