From 8c4a906b7b12ff52142e813a002d770ec81cf9cc Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 19 2020 18:28:11 +0000
Subject: import environment-modules-4.5.2-1.el8


---

diff --git a/.environment-modules.metadata b/.environment-modules.metadata
index 2cfa056..8d5742b 100644
--- a/.environment-modules.metadata
+++ b/.environment-modules.metadata
@@ -1 +1 @@
-f2a28c14d6df972d3ed9f5480279be09a21bcbe8 SOURCES/modules-4.5.1.tar.bz2
+a260805197fa5d5acd57f45505ded181025ead8e SOURCES/modules-4.5.2.tar.bz2
diff --git a/.gitignore b/.gitignore
index 8b72751..92057e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/modules-4.5.1.tar.bz2
+SOURCES/modules-4.5.2.tar.bz2
diff --git a/SOURCES/environment-modules-configure.patch b/SOURCES/environment-modules-configure.patch
new file mode 100644
index 0000000..9994a6b
--- /dev/null
+++ b/SOURCES/environment-modules-configure.patch
@@ -0,0 +1,17 @@
+Partially reverts https://github.com/cea-hpc/modules/commit/6a80cd9a460160fee96ed46b175b716989adbf27.
+Fedora still uses rpm macros that add "--build=x86_64-redhat-linux-gnu" to the configure arguments
+and since this configure is not a proper gnu one, it would always error out and never build.
+
+See https://bugzilla.redhat.com/show_bug.cgi?id=1842562.
+
+--- a/configure	2020-07-30 14:13:34.000000000 +0200
++++ b/configure	2020-08-03 16:06:37.137023909 +0200
+@@ -598,8 +598,6 @@
+    --with-x|--without-x)
+       # pass argument supported by compat version to its ./configure script
+       compatarglist+="$arg " ;;
+-   *)
+-      echo_error "Unrecognized option \`$arg'" 1;;
+    esac
+ done
+ 
diff --git a/SPECS/environment-modules.spec b/SPECS/environment-modules.spec
index 22ae776..c4a7911 100644
--- a/SPECS/environment-modules.spec
+++ b/SPECS/environment-modules.spec
@@ -2,7 +2,7 @@
 %global vimdatadir %{_datadir}/vim/vimfiles
 
 Name:           environment-modules
-Version:        4.5.1
+Version:        4.5.2
 Release:        1%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
@@ -10,6 +10,7 @@ Group:          System Environment/Base
 License:        GPLv2+
 URL:            http://modules.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2
+Patch0001:      environment-modules-configure.patch
 
 BuildRequires:  tcl-devel, libX11-devel
 BuildRequires:  dejagnu, sed, procps, hostname, man, less
@@ -57,6 +58,7 @@ This package provides Environment Modules compatibility version (3.2).
 
 %prep
 %setup -q -n modules-%{version}
+%patch0001 -p1
 
 
 %build
@@ -189,6 +191,9 @@ fi
 
 
 %changelog
+* Tue Aug 18 2020 Jan Synáček <jsynacek@redhat.com> - 4.5.2-1
+- Update to 4.5.2 (#1860674)
+
 * Mon Jul 13 2020 Jan Synáček <jsynacek@redhat.com> - 4.5.1-1
 - Update to 4.5.1 (#1642837)