Fix compatibility with Jinja <= 2.9

The namespace() feature works since 2.10+.  Also update common for
pretty-printing output of the 'make generate' rule.

Author: praiskup

common

@@ -17,8 +17,7 @@ specs:
                   'httpd24-mod_auth_kerb', 'httpd24-mod_ldap', 'httpd24-mod_session',
                   'atlas-devel', 'gcc-gfortran', 'libffi-devel', 'libtool-ltdl enchant']
       extra_pkgs:
-        - version: "2.7"
-          value: ['libjpeg-turbo', 'libjpeg-turbo-devel']
+        "2.7": ['libjpeg-turbo', 'libjpeg-turbo-devel']
 
     rhel:
       distros:

specs/multispec.yml

@@ -1,11 +1,5 @@
 {% import "src/common.tpl" as common with context %}
 {% import "src/" + config.os.id + "/macros.tpl" as macros with context %}
-{% set ns = namespace(extra_pkgs=[]) %}
-{% for item in spec.extra_pkgs %}
-{%   if spec.version == item.version %}
-{%     set ns.extra_pkgs = item.value %}
-{%   endif %}
-{% endfor %}
 {% if config.os.id == 'rhel' and spec.base_img_version %}
 {%   set img_tag = spec.base_img_version %}
 {% elif spec.img_tag %}
@@ -43,7 +37,8 @@ LABEL summary="$SUMMARY" \
       io.openshift.expose-services="8080:http" \
       io.openshift.tags="builder,python,python{{ spec.short_ver }},rh-python{{ spec.short_ver }}" \
 {{ macros.labels(spec) }}
-RUN INSTALL_PKGS="{{ common.list_pkgs(ns.extra_pkgs + spec.python_pkgs + spec.base_pkgs) -}}
+{% set extra_pkgs = spec.extra_pkgs[spec.version] if spec.extra_pkgs and spec.extra_pkgs[spec.version] else [] %}
+RUN INSTALL_PKGS="{{ common.list_pkgs(extra_pkgs + spec.python_pkgs + spec.base_pkgs) -}}
     {% if spec.preinstall_cmd %}
 {{ common.preinstall_cmd(spec) -}}
     {% endif %}