From 146fa75fdcb109817e4c8f6a4393a9b2d4a0095b Mon Sep 17 00:00:00 2001
From: Jan Synacek <jsynacek@redhat.com>
Date: Tue, 20 Feb 2018 09:16:27 +0100
Subject: [PATCH] Update to 4.1.1 (#1546450, #1139165, #1545369)

Resolves: #1546450, #1139165, #1545369
---
 .gitignore                 |  1 +
 environment-modules.spec   | 16 ++++++++++------
 macros.environment-modules |  3 ---
 sources                    |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)
 delete mode 100644 macros.environment-modules

diff --git a/.gitignore b/.gitignore
index d0fe524..5923b20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ modules-3.2.8.tar.bz2
 /modules-3.2.10.tar.bz2
 /modules-4.0.0.tar.bz2
 /modules-4.1.0.tar.bz2
+/modules-4.1.1.tar.bz2
diff --git a/environment-modules.spec b/environment-modules.spec
index c8e789b..d319147 100644
--- a/environment-modules.spec
+++ b/environment-modules.spec
@@ -1,19 +1,18 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           environment-modules
-Version:        4.1.0
-Release:        2%{?dist}
+Version:        4.1.1
+Release:        1%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
 Group:          System Environment/Base
 License:        GPLv2+
 URL:            http://modules.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2
-Source4:        macros.%{name}
 
 BuildRequires:  tcl-devel, tclx-devel, libX11-devel
-BuildRequires:  dejagnu, sed, hostname, man, less
-Requires:       tcl, sed, procps, man, hostname, less
+BuildRequires:  dejagnu, sed, procps, hostname, man, less
+Requires:       tcl, sed, procps, man, less
 Requires(post): %{_sbindir}/update-alternatives
 Requires(postun): %{_sbindir}/update-alternatives
 Provides:	environment(modules)
@@ -45,6 +44,7 @@ have access to the module alias.
 %package compat
 Summary:        Environment Modules compatibility version
 Requires:       environment-modules = %{version}-%{release}
+Requires:       hostname
 
 %description compat
 The Environment Modules package provides for the dynamic modification of
@@ -102,7 +102,7 @@ cp -p contrib/scripts/createmodule.py %{buildroot}%{_datadir}/Modules/bin
 sed -i -e 1s,/usr/bin/python,/usr/bin/python3, \
     %{buildroot}%{_datadir}/Modules/bin/createmodule.py
 
-install -Dpm 644 %{SOURCE4} %{buildroot}/%{macrosdir}/macros.%{name}
+install -Dpm 644 contrib/rpm/macros.%{name} %{buildroot}/%{macrosdir}/macros.%{name}
 
 %check
 make test
@@ -175,6 +175,10 @@ fi
 
 
 %changelog
+* Tue Feb 20 2018 Jan Synáček <jsynacek@redhat.com> - 4.1.1-1
+- Update to 4.1.1 (#1546450, #1139165, #1545369)
+  + Big thanks to Xavier Delaruelle for a spec patch!
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/macros.environment-modules b/macros.environment-modules
deleted file mode 100644
index e3592a8..0000000
--- a/macros.environment-modules
+++ /dev/null
@@ -1,3 +0,0 @@
-# RPM macros for environment modules
-
-%_modulesdir %{_datadir}/modulefiles
diff --git a/sources b/sources
index aa6f2b2..6ab2666 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (modules-4.1.0.tar.bz2) = 28c68bf0c0c939db93186b355eb7162f503de8f179c8ed1b8fd83585e363ecc43bf34376a0508e3d2bcc164855b73917e067b79980194ce587dbb0d49d16dbd7
+SHA512 (modules-4.1.1.tar.bz2) = 5cf253251cea6c911008ecec3fd686aa683e20f0ab60d77811682ab2fdd9135d1fbfb6712f72cc6404e1716f1a09847934812dccad42d36a6594b1f292dbffdc