Merge pull request #221 from noelmcloughlin/devpkg

Fix dev package os dependencies

Author: aboe76

postgres/defaults.yaml

@@ -7,6 +7,7 @@ postgres:
   pkgs_extra: []
   pkg_client: postgresql-client
   pkg_dev: postgresql-devel
+  pkg_dev_deps: []
   pkg_libpq_dev: libpq-dev
   pkg_libs: postgresql-libs
   pkg_python: python-psycopg2

postgres/dev.sls

@@ -1,26 +1,18 @@
 {% from tpldir + "/map.jinja" import postgres with context %}
 
 {% if grains.os not in ('Windows', 'MacOS',) %}
+  {%- set pkgs = [postgres.pkg_dev, postgres.pkg_libpq_dev] + postgres.pkg_dev_deps %}
 
-  {% if postgres.pkg_dev %}
-install-postgres-dev-package:
+  {% if pkgs %}
+install-postgres-dev-packages:
   pkg.installed:
-    - name: {{ postgres.pkg_dev }}
+    - pkgs: {{ pkgs }}
     {% if postgres.fromrepo %}
     - fromrepo: {{ postgres.fromrepo }}
     {% endif %}
   {% endif %}
 
-  {% if postgres.pkg_libpq_dev %}
-install-postgres-libpq-dev:
-  pkg.installed:
-    - name: {{ postgres.pkg_libpq_dev }}
-    {% if postgres.fromrepo %}
-    - fromrepo: {{ postgres.fromrepo }}
-    {% endif %}
-  {% endif %}
-
-# Alternatives system. Make devclient binaries available in $PATH
+  # Alternatives system. Make devclient binaries available in $PATH
   {%- if 'bin_dir' in postgres and postgres.linux.altpriority %}
     {%- for bin in postgres.dev_bins %}
       {%- set path = salt['file.join'](postgres.bin_dir, bin) %}

postgres/osfamilymap.yaml

@@ -101,6 +101,11 @@ RedHat:
 
 {% endif %}
   pkg_libpq_dev: libpqxx-devel
+  pkg_dev_deps:
+    - perl-Time-HiRes
+    - libicu-devel
+    - perl-IPC-Run
+    - perl-Test-Simple
 
 Suse:
   pkg_repo: