]> granicus.if.org Git - graphviz/commitdiff
Add install of RPM package from Centos and Fedora CMake builds
authorMagnus Jacobsson <magnus.jacobsson@berotec.se>
Tue, 6 Oct 2020 16:38:34 +0000 (18:38 +0200)
committerMagnus Jacobsson <magnus.jacobsson@berotec.se>
Thu, 15 Oct 2020 16:10:45 +0000 (18:10 +0200)
ci/install-packages.sh

index 18db70e5642090d2da414efd71e7ab7181602e49..8ef13ae97100db68fa18c28292e71e1b6590d00d 100755 (executable)
@@ -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