enable Mingle on CentOS 7 in CI

Related to #1835.

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95d369af9b256110aa309489b1544adb2a2bd873..51a1e0eabeaa14fe0d9cb6c0f77c6d1b82793889 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - The Ming plugin that produced Shockwave files has been removed. This format
   was EOLed by Adobe in April 2019. #2160
+- CentOS 7 packages now include libmingle and the `mingle` program.
 
 ### Fixed
 

diff --git a/ci/tests.py b/ci/tests.py
index f59e636f010502a883f634b9bdeb551083ca7c46..dbb01e968e9d313517ae317195422662c5115ed9 100644 (file)
--- a/ci/tests.py
+++ b/ci/tests.py
@@ -106,7 +106,7 @@ def test_existence(binary: str):
 
   # FIXME: Remove skip when
   # https://gitlab.com/graphviz/graphviz/-/issues/1835 is fixed
-  if os_id in ["ubuntu", "centos"] and binary == "mingle":
+  if os_id == "ubuntu" and binary == "mingle":
     check_that_tool_does_not_exist(binary, os_id)
     pytest.skip(f"mingle is not built for {os_id} (#1835)")
 

diff --git a/redhat/graphviz.spec.fedora.in b/redhat/graphviz.spec.fedora.in
index 6cec6b69883f284551c01475476da5c1c4ad9749..7a7a8bb790a4d6bf1c03a23abbd7df2c08373cdd 100644 (file)
--- a/redhat/graphviz.spec.fedora.in
+++ b/redhat/graphviz.spec.fedora.in
@@ -38,7 +38,6 @@ Source0: https://gitlab.com/graphviz/graphviz/-/archive/@VERSION@/graphviz-@VERS
 # Overrides for RHEL
 %if 0%{?rhel}
 %global LICENSE    0
-%global ANN        0
 %global ARRRR      0
 %global DEEEE      0
 %global DEVIL      0