From 96e81a11109dffaa45d7a3a8ce71eed539d5b258 Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Fri, 10 Dec 2021 07:56:54 -0800 Subject: [PATCH] enable Mingle on CentOS 7 in CI Related to #1835. --- CHANGELOG.md | 1 + ci/tests.py | 2 +- redhat/graphviz.spec.fedora.in | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95d369af9..51a1e0eab 100644 --- 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 f59e636f0..dbb01e968 100644 --- 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 6cec6b698..7a7a8bb79 100644 --- 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 -- 2.40.0