From cc548d2de6649bd47549979884ef09b7ce895a55 Mon Sep 17 00:00:00 2001
From: Jan Synacek <jsynacek@redhat.com>
Date: Tue, 21 Nov 2017 08:49:25 +0100
Subject: [PATCH] Fix 4.0.0 BuildRequires and Requires (#1503408)

Also, fix installing manpages as alternatives.

Big thanks to Xavier Delaruelle for a spec patch!

Resolves: #1503408
---
 environment-modules.spec | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/environment-modules.spec b/environment-modules.spec
index f6721c0..b4acf81 100644
--- a/environment-modules.spec
+++ b/environment-modules.spec
@@ -2,7 +2,7 @@
 
 Name:           environment-modules
 Version:        4.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
 Group:          System Environment/Base
@@ -12,10 +12,8 @@ Source0:        http://downloads.sourceforge.net/modules/modules-%{version}.tar.
 Source4:        macros.%{name}
 
 BuildRequires:  tcl-devel, tclx-devel, libX11-devel
-BuildRequires:  dejagnu
-BuildRequires:  man
-#For ps in startup script
-Requires:       procps
+BuildRequires:  dejagnu, sed, hostname, man
+Requires:       tcl, sed, procps, man, hostname
 Requires(post): %{_sbindir}/update-alternatives
 Requires(postun): %{_sbindir}/update-alternatives
 Provides:	environment(modules)
@@ -65,8 +63,7 @@ This package provides Environment Modules compatibility version (3.2).
            --libexecdir=%{_datadir}/Modules/libexec \
            --docdir=%{_docdir}/%{name} \
            --enable-dotmodulespath \
-           --with-modulepath=%{_datadir}/Modules/modulefiles:%{_sysconfdir}/modulefiles:%{_datadir}/modulefiles \
-           --with-quarantine-vars=LD_LIBRARY_PATH
+           --with-modulepath=%{_datadir}/Modules/modulefiles:%{_sysconfdir}/modulefiles:%{_datadir}/modulefiles
 make %{?_smp_mflags}
 
 
@@ -123,7 +120,9 @@ fi
 %{_sbindir}/update-alternatives \
   --install %{_sysconfdir}/profile.d/modules.sh modules.sh %{_datadir}/Modules/init/profile.sh 40 \
   --slave %{_sysconfdir}/profile.d/modules.csh modules.csh %{_datadir}/Modules/init/profile.csh \
-  --slave %{_bindir}/modulecmd modulecmd %{_datadir}/Modules/libexec/modulecmd.tcl
+  --slave %{_bindir}/modulecmd modulecmd %{_datadir}/Modules/libexec/modulecmd.tcl \
+  --slave %{_mandir}/man1/module.1.gz module.1.gz %{_mandir}/man1/module-c.1.gz \
+  --slave %{_mandir}/man4/modulefile.4.gz modulefile.4.gz %{_mandir}/man4/modulefile-c.4.gz
 
 %post compat
 %{_sbindir}/update-alternatives \
@@ -159,6 +158,8 @@ fi
 %config(noreplace) %{_datadir}/Modules/init/.modulespath
 %{_datadir}/Modules/modulefiles
 %{_datadir}/modulefiles
+%ghost %{_mandir}/man1/module.1.gz
+%ghost %{_mandir}/man4/modulefile.4.gz
 %{_mandir}/man1/module-c.1.gz
 %{_mandir}/man4/modulefile-c.4.gz
 %{macrosdir}/macros.%{name}
@@ -171,6 +172,11 @@ fi
 
 
 %changelog
+* Tue Nov 21 2017 Jan Synáček <jsynacek@redhat.com> - 4.0.0-2
+- Fix 4.0.0 BuildRequires and Requires (#1503408)
+  + Big thanks to Xavier Delaruelle for a spec patch!
+- Fix installing manpages as alternatives
+
 * Mon Nov 20 2017 Jan Synáček <jsynacek@redhat.com> - 4.0.0-1
 - Update to 4.0.0 (#1503408)