From b848eca4a2fbfab91c030a75233a785fa11e0185 Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Wed, 2 Jun 2021 19:16:54 -0500 Subject: [PATCH 1/2] CMake3 has a different package name on EL7 --- rpm/scitokens-cpp.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rpm/scitokens-cpp.spec b/rpm/scitokens-cpp.spec index aa0a3d9..9f91c39 100644 --- a/rpm/scitokens-cpp.spec +++ b/rpm/scitokens-cpp.spec @@ -19,7 +19,11 @@ Source0: https://github.com/scitokens/scitokens-cpp/releases/download/v%{version BuildRequires: gcc-c++ BuildRequires: make +%if 0%{?rhel} < 8 +BuildRequires: cmake3 +%else BuildRequires: cmake +%endif BuildRequires: sqlite-devel BuildRequires: openssl-devel BuildRequires: libcurl-devel From 4df949019b2ed6eab26e223f86ab3de77a70f860 Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Thu, 3 Jun 2021 11:05:15 -0500 Subject: [PATCH 2/2] Only specify CMake 3 for EL7 for the OSG Koji --- rpm/scitokens-cpp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/scitokens-cpp.spec b/rpm/scitokens-cpp.spec index 9f91c39..afaa255 100644 --- a/rpm/scitokens-cpp.spec +++ b/rpm/scitokens-cpp.spec @@ -19,7 +19,7 @@ Source0: https://github.com/scitokens/scitokens-cpp/releases/download/v%{version BuildRequires: gcc-c++ BuildRequires: make -%if 0%{?rhel} < 8 +%if 0%{?rhel} < 8 && 0%{?osg} BuildRequires: cmake3 %else BuildRequires: cmake