From: Magnus Jacobsson <magnus.jacobsson@berotec.se>
Date: Tue, 6 Oct 2020 16:38:34 +0000 (+0200)
Subject: Add install of RPM package from Centos and Fedora CMake builds
X-Git-Tag: 2.46.0~20^2^2~38^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=25f59b51a9b75ae25a62f942e866b3c3958094e9;p=graphviz

Add install of RPM package from Centos and Fedora CMake builds
---

diff --git a/ci/install-packages.sh b/ci/install-packages.sh
index 18db70e56..8ef13ae97 100755
--- a/ci/install-packages.sh
+++ b/ci/install-packages.sh
@@ -24,15 +24,19 @@ if [ "${ID_LIKE}" = "debian" ]; then
         apt install ./${DIR}/os/${ARCH}/graphviz_${GV_VERSION}-1_amd64.deb
     fi
 else
-    rpm --install --force \
-        ${DIR}/os/${ARCH}/graphviz-${GV_VERSION}*.rpm \
-        ${DIR}/os/${ARCH}/graphviz-libs-${GV_VERSION}*.rpm \
-        ${DIR}/os/${ARCH}/graphviz-devel-${GV_VERSION}*.rpm \
-        ${DIR}/os/${ARCH}/graphviz-plugins-core-${GV_VERSION}*.rpm \
-        ${DIR}/os/${ARCH}/graphviz-plugins-x-${GV_VERSION}*.rpm \
-        ${DIR}/os/${ARCH}/graphviz-x-${GV_VERSION}*.rpm \
-        ${DIR}/os/${ARCH}/graphviz-gd-${GV_VERSION}*.rpm \
-        ${DIR}/os/${ARCH}/graphviz-qt-${GV_VERSION}*.rpm \
-        ${DIR}/os/${ARCH}/graphviz-plugins-gd-${GV_VERSION}*.rpm \
-        ${DIR}/os/${ARCH}/graphviz-nox-${GV_VERSION}*.rpm
+    if [ "${build_system}" = "cmake" ]; then
+        rpm --install --force ${DIR}/os/${ARCH}/Graphviz-${GV_VERSION}-Linux.rpm
+    else
+        rpm --install --force \
+            ${DIR}/os/${ARCH}/graphviz-${GV_VERSION}*.rpm \
+            ${DIR}/os/${ARCH}/graphviz-libs-${GV_VERSION}*.rpm \
+            ${DIR}/os/${ARCH}/graphviz-devel-${GV_VERSION}*.rpm \
+            ${DIR}/os/${ARCH}/graphviz-plugins-core-${GV_VERSION}*.rpm \
+            ${DIR}/os/${ARCH}/graphviz-plugins-x-${GV_VERSION}*.rpm \
+            ${DIR}/os/${ARCH}/graphviz-x-${GV_VERSION}*.rpm \
+            ${DIR}/os/${ARCH}/graphviz-gd-${GV_VERSION}*.rpm \
+            ${DIR}/os/${ARCH}/graphviz-qt-${GV_VERSION}*.rpm \
+            ${DIR}/os/${ARCH}/graphviz-plugins-gd-${GV_VERSION}*.rpm \
+            ${DIR}/os/${ARCH}/graphviz-nox-${GV_VERSION}*.rpm
+    fi
 fi