From 0eddd71853ec632c715b503330ce3a9a212c0c29 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 9 Feb 2023 15:11:03 +0100 Subject: reorder --- php-pecl-mongodb.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/php-pecl-mongodb.spec b/php-pecl-mongodb.spec index 0dd702a..f6be753 100644 --- a/php-pecl-mongodb.spec +++ b/php-pecl-mongodb.spec @@ -139,7 +139,13 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml pushd NTS + %if %{with syslib} +# Check our macro values +cat src/*_VERSION_CURRENT +grep -q %{bundled_libmongo} src/LIBMONGOC_VERSION_CURRENT +grep -q %{bundled_libcrypt} src/LIBMONGOCRYPT_VERSION_CURRENT + # temporary: lower minimal required versions sed -e 's/%{bundled_libmongo}/%{system_libmongo}/;s/%{bundled_libcrypt}/%{system_libcrypt}/' -i config.m4 %endif @@ -151,12 +157,8 @@ if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then exit 1 fi -# Check our macro values -cat src/*_VERSION_CURRENT -grep %{bundled_libmongo} src/LIBMONGOC_VERSION_CURRENT -grep %{bundled_libcrypt} src/LIBMONGOCRYPT_VERSION_CURRENT - popd + %if %{with_zts} # Duplicate source tree for NTS / ZTS build cp -pr NTS ZTS -- cgit