From f18bce46f4f53cc5b896e6edbf4c95bce86b9bed Mon Sep 17 00:00:00 2001 From: Patrick Schratz Date: Wed, 11 Sep 2024 11:21:47 +0200 Subject: [PATCH 1/4] Update imagemagick.json --- rules/imagemagick.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/imagemagick.json b/rules/imagemagick.json index f0431f9..1ff40b3 100644 --- a/rules/imagemagick.json +++ b/rules/imagemagick.json @@ -56,7 +56,7 @@ ] }, { - "packages": ["ImageMagick", "ImageMagick-c++"], + "packages": ["ImageMagick", "ImageMagick-c++", "ImageMagick-c++-devel", "ImageMagick-devel"], "constraints": [ { "os": "linux", @@ -66,7 +66,7 @@ ] }, { - "packages": ["ImageMagick", "ImageMagick-c++"], + "packages": ["ImageMagick", "ImageMagick-c++", "ImageMagick-c++-devel", "ImageMagick-devel"], "pre_install": [ { "command": "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm" @@ -81,7 +81,7 @@ ] }, { - "packages": ["ImageMagick", "ImageMagick-c++"], + "packages": ["ImageMagick", "ImageMagick-c++", "ImageMagick-c++-devel", "ImageMagick-devel"], "pre_install": [ { "command": "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm" } ], From 7815ceba04f3b4676e2751d58b8dc5e13c4eff0e Mon Sep 17 00:00:00 2001 From: Patrick Schratz Date: Fri, 13 Sep 2024 09:56:25 +0200 Subject: [PATCH 2/4] Update rules/imagemagick.json Co-authored-by: Greg Lin --- rules/imagemagick.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/imagemagick.json b/rules/imagemagick.json index 1ff40b3..798b3bc 100644 --- a/rules/imagemagick.json +++ b/rules/imagemagick.json @@ -56,7 +56,7 @@ ] }, { - "packages": ["ImageMagick", "ImageMagick-c++", "ImageMagick-c++-devel", "ImageMagick-devel"], + "packages": ["ImageMagick-c++-devel", "ImageMagick-devel"], "constraints": [ { "os": "linux", From ef5abaa557570d747d267962d8040606d4b514fb Mon Sep 17 00:00:00 2001 From: Patrick Schratz Date: Fri, 13 Sep 2024 09:59:22 +0200 Subject: [PATCH 3/4] remove most non-devel rules --- rules/imagemagick.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rules/imagemagick.json b/rules/imagemagick.json index 798b3bc..885c20c 100644 --- a/rules/imagemagick.json +++ b/rules/imagemagick.json @@ -2,7 +2,7 @@ "patterns": ["\\bimagemagick\\b", "\\bimage magick\\b"], "dependencies": [ { - "packages": ["imagemagick", "libmagick++-dev", "gsfonts"], + "packages": ["imagemagick-dev", "libmagick++-dev", "gsfonts"], "constraints": [ { "os": "linux", @@ -15,7 +15,7 @@ ] }, { - "packages": ["ImageMagick", "ImageMagick-c++-devel"], + "packages": ["ImageMagick-devel", "ImageMagick-c++-devel"], "constraints": [ { "os": "linux", @@ -29,7 +29,7 @@ ] }, { - "packages": ["ImageMagick", "ImageMagick-c++-devel"], + "packages": ["ImageMagick-devel", "ImageMagick-c++-devel"], "pre_install": [ { "command": "dnf install -y dnf-plugins-core" }, { "command": "dnf config-manager --set-enabled powertools" }, @@ -44,7 +44,7 @@ ] }, { - "packages": ["ImageMagick", "ImageMagick-c++-devel"], + "packages": ["ImageMagick-devel", "ImageMagick-c++-devel"], "pre_install": [ { "command": "dnf install -y epel-release" } ], @@ -66,7 +66,7 @@ ] }, { - "packages": ["ImageMagick", "ImageMagick-c++", "ImageMagick-c++-devel", "ImageMagick-devel"], + "packages": ["ImageMagick-c++-devel", "ImageMagick-devel"], "pre_install": [ { "command": "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm" @@ -81,7 +81,7 @@ ] }, { - "packages": ["ImageMagick", "ImageMagick-c++", "ImageMagick-c++-devel", "ImageMagick-devel"], + "packages": ["ImageMagick-c++-devel", "ImageMagick-devel"], "pre_install": [ { "command": "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm" } ], @@ -94,7 +94,7 @@ ] }, { - "packages": ["ImageMagick", "ImageMagick-devel", "libMagick++-devel"], + "packages": ["ImageMagick-devel", "libMagick++-devel"], "constraints": [ { "os": "linux", From 9e0bf8e865f9a5ee2dc970ad67ed17e2002d3f37 Mon Sep 17 00:00:00 2001 From: Patrick Schratz Date: Fri, 13 Sep 2024 10:04:15 +0200 Subject: [PATCH 4/4] remove imagemagick-dev on debian/ubuntu --- rules/imagemagick.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/imagemagick.json b/rules/imagemagick.json index 885c20c..ef8dca3 100644 --- a/rules/imagemagick.json +++ b/rules/imagemagick.json @@ -2,7 +2,7 @@ "patterns": ["\\bimagemagick\\b", "\\bimage magick\\b"], "dependencies": [ { - "packages": ["imagemagick-dev", "libmagick++-dev", "gsfonts"], + "packages": ["libmagick++-dev", "gsfonts"], "constraints": [ { "os": "linux",