diff --git a/.gitignore b/.gitignore index 991b768..1401ddf 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ modules-3.2.8.tar.bz2 /modules-4.4.0.tar.bz2 /modules-4.4.1.tar.bz2 /modules-4.5.0.tar.bz2 +/modules-4.5.2.tar.bz2 diff --git a/environment-modules-configure.patch b/environment-modules-configure.patch new file mode 100644 index 0000000..9994a6b --- /dev/null +++ b/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/environment-modules.spec b/environment-modules.spec index 23ff903..34cb1df 100644 --- a/environment-modules.spec +++ b/environment-modules.spec @@ -2,13 +2,14 @@ %global vimdatadir %{_datadir}/vim/vimfiles Name: environment-modules -Version: 4.5.0 -Release: 2%{?dist} +Version: 4.5.2 +Release: 1%{?dist} Summary: Provides dynamic modification of a user's environment License: GPLv2+ URL: http://modules.sourceforge.net/ Source0: http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2 +Patch0001: environment-modules-configure.patch BuildRequires: gcc BuildRequires: tcl-devel, tclx-devel, libX11-devel @@ -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 +* Mon Aug 3 2020 Jan Synáček - 4.5.2-1 +- Update to 4.5.2 (#1842562) + * Mon Jul 27 2020 Fedora Release Engineering - 4.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 6fa4a4f..5ef7e75 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (modules-4.5.0.tar.bz2) = 705d1677c6d4fac1ebb5bad0a726c9e6833f1c061855e9fa01f1e369d9d53cedf9a2decec73288fb3c08137c510bfdb6c670521282bb470855f4a2cd51a47f8e +SHA512 (modules-4.5.2.tar.bz2) = 9da6dc3af117719ab8285ffa662f973c7324daaa8d780b5bb8b6dea35c19ba198a11d7bba7db59d8ea11d6b2f97865e58388a5535889d8e63ac617ca008702ad