Merge branch 'master' into epel7

environment-modules in RHEL7 does not define the macro.

icecream.spec

@@ -1,6 +1,8 @@
 %global _hardened_build 1
 %bcond_without selinux
 
+%{!?_modulesdir: %global _modulesdir %{_datadir}/Modules/modulefiles }
+
 Name:     icecream
 Version:  1.1
 Release:  2%{?dist}
@@ -29,12 +31,12 @@ BuildRequires: systemd
 BuildRequires: libcap-ng-devel
 BuildRequires: lzo-devel
 BuildRequires: docbook2X
-BuildRequires: environment(modules)
+BuildRequires: environment-modules
 BuildRequires: firewalld-filesystem
 BuildRequires: autoconf automake libtool
 
 Requires:         firewalld-filesystem
-Requires:         environment(modules)
+Requires:         environment-modules
 Requires(pre):    shadow-utils
 Requires(post):   systemd
 Requires(preun):  systemd
@@ -266,15 +268,15 @@ exit 0
 * Wed Aug 09 2017 Michal Schmidt <mschmidt@redhat.com> - 1.1-1
 - Upstream release 1.1.
 
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-0.10.rc3.g22fcc39
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-0.9.rc3.g22fcc39
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
 * Fri Jul 21 2017 Michal Schmidt <mschmidt@redhat.com> - 1.1-0.8.rc3.g22fcc39
 - Update to upstream rc3 plus latest commits.
 
+* Tue Jul 04 2017 Michal Schmidt <mschmidt@redhat.com> - 1.1-0.7.rc2.g1c15f6b.el7.1
+- Adjust dependencies. In RHEL7 the only supported implementation of
+  environment modules is environment-modules. The 'environment(modules)'
+  provide is not present.
+- Define _modulesdir. environment-modules in RHEL7 does not define the macro.
+
 * Mon Jul 03 2017 Michal Schmidt <mschmidt@redhat.com> - 1.1-0.7.rc2.g1c15f6b
 - Current git snapshot.