rename CMake-produced RPM to *-cmake to disambiguate

Now that the Autotools-produced RPMs are consolidated into tarballs, someone
looking at a flat list of all the release artifacts could incorrectly conclude
that Graphviz-${GV_VERSION}-Linux.rpm is an alternative complete package to the
tarballs. Renaming this makes it clearer that it originates from the CMake build
system and is incomplete.

Note that this also removes the `os` hierarchy in the packaging directories for
these artifacts. All RPM artifacts are now produced without any
`os`/`debug`/`source` subdirectory.

Related to #2147.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2bf060eab6413ab96e38654601afe94266bca8b7..214ff9bef29c3d9a158f21bd91c8b8bd31f7a924 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,7 +47,7 @@ portable-source:
         expire_in: 1 week
         paths:
             - Packages/*/*/*.tar.xz
-            - Packages/*/*/*/*.rpm
+            - Packages/*/*/*.rpm
             - Metadata/*/*/configure.log
             - GRAPHVIZ_VERSION
         reports:

diff --git a/ci/build.sh b/ci/build.sh
index ffa273a4ec8720256055164985f953c99f144354..2ce64463f096a59f0d9c60522faf2a4141e7b587 100755 (executable)
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -36,7 +36,8 @@ if [ "${build_system}" = "cmake" ]; then
         if [ "${ID_LIKE:-}" = "debian" ]; then
             mv build/*.deb ${DIR}/os/
         else
-            mv build/*.rpm ${DIR}/os/
+            GV_VERSION=$(python3 gen_version.py)
+            mv build/Graphviz-${GV_VERSION}-Linux.rpm ${DIR}/graphviz-${GV_VERSION}-cmake.rpm
         fi
     elif [[ "${OSTYPE}" =~ "darwin" ]]; then
         mv build/*.zip ${DIR}/os/

diff --git a/ci/install-packages.sh b/ci/install-packages.sh
index 062322ae60344ff23620e40d410fd36e14d2cc44..590bbba373cf5ed1cc1259e06db5b4919564eaf7 100755 (executable)
--- a/ci/install-packages.sh
+++ b/ci/install-packages.sh
@@ -37,7 +37,7 @@ if [ "${build_system}" = "cmake" ]; then
         unzip ${DIR}/os/Graphviz-${GV_VERSION}-Darwin.zip
         cp -rp Graphviz-${GV_VERSION}-Darwin/* /usr/local
     else
-        rpm --install --force ${DIR}/os/Graphviz-${GV_VERSION}-Linux.rpm
+        rpm --install --force ${DIR}/graphviz-${GV_VERSION}-cmake.rpm
     fi
 else
     if [ "${ID_LIKE}" = "debian" ]; then