Remove urw-base35-fonts support

rpms/Dockerfile

@@ -2,8 +2,15 @@ ARG BASE_IMAGE
 
 FROM ${BASE_IMAGE}
 
+ARG NOAGPL
+ENV NOAGPL=${NOAGPL}
+
 RUN yum install -y epel-release git make yum-utils rpm-build && \
-    yum group install -y "Development Tools" && \
+    if [ "$NOAGPL" = "true" ]; then \
+      yum group install -y "Development Tools" --exclude asciidoc; \
+    else \
+      yum group install -y "Development Tools"; \
+    fi && \
     yum clean all
 
 ARG BASE_IMAGE

rpms/entrypoint.sh

@@ -36,6 +36,10 @@ sed -i '/BuildRequires.*ghostscript-devel/d; s/--with-gslib/--without-gslib/' Im
 # Drop LibRaw support which is not compatible with the current version of ImageMagick
 sed -i '/BuildRequires.*LibRaw/d; /--with-raw/d' ImageMagick.spec.in
 
+# Drop urw-base35-fonts support, which has AGPL license.
+sed -i '/BuildRequires.*urw-base35-fonts/d; /--with-urw-base35-fonts/d' ImageMagick.spec.in
+
+
 AFTER_CHECKOUT_HOOK_SCRIPT="../after-checkout-${BASE_IMAGE//:/}-$IMAGEMAGICK_VERSION.sh"
 if [ -x "$AFTER_CHECKOUT_HOOK_SCRIPT" ]; then
     "$AFTER_CHECKOUT_HOOK_SCRIPT"
@@ -57,5 +61,6 @@ cd "/root/rpmbuild/RPMS/$TARGET_ARCH"
 
 echo "Testing package for unexpected dependencies"
 rpm -qp --requires ImageMagick-libs-$IMAGEMAGICK_VERSION.$TARGET_ARCH.rpm | grep -qEv 'libgs'
+rpm -qp --requires ImageMagick-libs-$IMAGEMAGICK_VERSION.$TARGET_ARCH.rpm | grep -qEv 'urw-base35-fonts'
 
 exec /tests.sh $IMAGEMAGICK_VERSION $TARGET_ARCH