rpm/Modules
SHA256
1
0
Fork 0
forked from pool/Modules
Code Pull Requests Activity

- update to 3.2.10

Browse Source 
* Fixed the module switch with custom delimiters (Tyson Whitehead)
  * If a bash shell check if interactive or not for alias/functions
  * Fix the flags with regards to recursive load/unload
  * Fix perl.pm init file typo (bug 3497092)
  * Moved from cvs to git (and now: modulefile/module-git)
  * Fix the module swap with the --delim option (Tyson Whitehead)
  * Increased the "update" buffer (Leon Kos)
  * Use the locale for sorting modulefiles by the avail command
  * Fixed the segfault problem with Tcl_RegExpCompile() (Kenneth Hoste,
    Tyson Whitehead)
  * Updated the FSF address in LICENSE.GPL (Jan Synacek)
  * Forked the Tcl-only version to be maintained by Kent Mein.
  * Added the "module-info type" query to return 'C' to indicate that
    the modulecmd executable is the "C" version.
    (The Tcl-only version will return 'Tcl'.)
  * Search /usr/lib64 for tclConfig.sh also (Jan Synacek)
  * Tested loading 20 other modulefiles from a single one
  * Have ChangeLog generated by a script due to Marcus D. Hanwell

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/Modules?expand=0&rev=13
This commit is contained in:
Klaus Kämpf 2012-12-21 09:01:30 +00:00 committed by Git OBS Bridge
parent 1632c098d5
commit 7feb74ef71
6 changed files with 104 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Modules.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Fri Dec 21 09:00:00 UTC 2012 - kkaempf@suse.com
- update to 3.2.10
* Fixed the module switch with custom delimiters (Tyson Whitehead)
* If a bash shell check if interactive or not for alias/functions
* Fix the flags with regards to recursive load/unload
* Fix perl.pm init file typo (bug 3497092)
* Moved from cvs to git (and now: modulefile/module-git)
* Fix the module swap with the --delim option (Tyson Whitehead)
* Increased the "update" buffer (Leon Kos)
* Use the locale for sorting modulefiles by the avail command
* Fixed the segfault problem with Tcl_RegExpCompile() (Kenneth Hoste,
Tyson Whitehead)
* Updated the FSF address in LICENSE.GPL (Jan Synacek)
* Forked the Tcl-only version to be maintained by Kent Mein.
* Added the "module-info type" query to return 'C' to indicate that
the modulecmd executable is the "C" version.
(The Tcl-only version will return 'Tcl'.)
* Search /usr/lib64 for tclConfig.sh also (Jan Synacek)
* Tested loading 20 other modulefiles from a single one
* Have ChangeLog generated by a script due to Marcus D. Hanwell
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 10 08:30:51 UTC 2012 - kkaempf@suse.com Mon Sep 10 08:30:51 UTC 2012 - kkaempf@suse.com

6
Modules.spec
View File

@ -21,20 +21,20 @@ BuildRequires: automake
BuildRequires: tcl-devel BuildRequires: tcl-devel
# xorg-x11-devel # xorg-x11-devel
Url: http://modules.sourceforge.net/ Url: http://modules.sourceforge.net/
Version: 3.2.9 Version: 3.2.10
Release: 0 Release: 0
Summary: Environment Modules Summary: Environment Modules
License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+
Group: System/Management Group: System/Management
Requires: tcl Requires: tcl
Source: modules-%{version}c.tar.bz2 Source: modules-%{version}.tar.bz2
# PATCH-FIX-OPENSUSE share.patch # PATCH-FIX-OPENSUSE share.patch
Patch0: share.patch Patch0: share.patch
# PATCH-FIX-UPSTREAM return.patch # PATCH-FIX-UPSTREAM return.patch
Patch1: return.patch Patch1: return.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: environment-modules Provides: environment-modules
Obsoletes: environment-modules Obsoletes: environment-modules < %{version}
%description %description
The Modules package provides for dynamic modification of a user's The Modules package provides for dynamic modification of a user's

3
modules-3.2.10.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e8403492a8d57ace6485813ad6cdaafe0a735b7d93b9435553a8d11d3fdd29a2
size 327611

3
modules-3.2.9c.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:142cfbf71e33ac8a4506d71dd650d1b613999538b5b0bcb7f24167e3600e6502
size 359384

7
return.patch
View File

@ -1,6 +1,7 @@
--- a/ModuleCmd_Avail.c.old 2012-08-29 01:06:16.176859774 +0100 diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/ModuleCmd_Avail.c ./ModuleCmd_Avail.c
+++ b/ModuleCmd_Avail.c 2012-08-29 01:06:52.540527924 +0100 --- ../orig-modules-3.2.10/ModuleCmd_Avail.c 2012-12-13 23:17:27.000000000 +0100
@@ -680,6 +680,7 @@ static int check_cache( char *dir) +++ ./ModuleCmd_Avail.c 2012-12-21 09:56:11.371774517 +0100
@@ -690,6 +690,7 @@
static int test_version_dir( struct dirent *dp) static int test_version_dir( struct dirent *dp)
{ {

142
share.patch
View File

@ -1,7 +1,7 @@
diff -wruN -x '*~' ../orig-modules-3.2.9/configure ./configure diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/configure ./configure
--- ../orig-modules-3.2.9/configure 2011-11-29 16:49:37.000000000 +0100 --- ../orig-modules-3.2.10/configure 2012-12-19 18:02:25.000000000 +0100
+++ ./configure 2012-09-10 10:12:14.088801974 +0200 +++ ./configure 2012-12-21 09:56:47.801240538 +0100
@@ -1484,9 +1484,9 @@ @@ -1494,9 +1494,9 @@
(tclExtend.h,...) [[none]] (tclExtend.h,...) [[none]]
--with-module-path=<path> --with-module-path=<path>
use module path=<path> use module path=<path>
@ -13,7 +13,7 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/configure ./configure
--with-tmp-dir=<dir> use <dir> as a temporary dir [[/tmp]] --with-tmp-dir=<dir> use <dir> as a temporary dir [[/tmp]]
--with-man-path=<dir> use <dir> for the default MANPATH --with-man-path=<dir> use <dir> for the default MANPATH
[[/usr/man:/usr/share/man]] [[/usr/man:/usr/share/man]]
@@ -1503,19 +1503,19 @@ @@ -1513,19 +1513,19 @@
Depending on the above configuration options the files are approximately Depending on the above configuration options the files are approximately
placed in the following directory structure : placed in the following directory structure :
@ -36,7 +36,7 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/configure ./configure
Some influential environment variables: Some influential environment variables:
@@ -2905,31 +2905,31 @@ @@ -2922,31 +2922,31 @@
fi fi
if test "$prefix" != "NONE" ; then if test "$prefix" != "NONE" ; then
if test "$WANTS_VERSIONING" -eq 1 ; then if test "$WANTS_VERSIONING" -eq 1 ; then
@ -80,7 +80,7 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/configure ./configure
export ac_default_prefix export ac_default_prefix
fi fi
PREFIX=$ac_default_prefix PREFIX=$ac_default_prefix
@@ -7462,7 +7462,7 @@ @@ -7516,7 +7516,7 @@
_ACEOF _ACEOF
else else
@ -89,7 +89,7 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/configure ./configure
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: will use MODULEPATH=$withval : rerun configure using --with-module-path to override default" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: will use MODULEPATH=$withval : rerun configure using --with-module-path to override default" >&5
$as_echo "$as_me: WARNING: will use MODULEPATH=$withval : rerun configure using --with-module-path to override default" >&2;} $as_echo "$as_me: WARNING: will use MODULEPATH=$withval : rerun configure using --with-module-path to override default" >&2;}
MODULEPATH="$withval" MODULEPATH="$withval"
@@ -7484,7 +7484,7 @@ @@ -7538,7 +7538,7 @@
else else
if test "$WANTS_VERSIONING" -eq 1 ; then if test "$WANTS_VERSIONING" -eq 1 ; then
@ -98,9 +98,9 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/configure ./configure
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: will use VERSIONPATH=$withval : rerun configure using --with-version-path to override default" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: will use VERSIONPATH=$withval : rerun configure using --with-version-path to override default" >&5
$as_echo "$as_me: WARNING: will use VERSIONPATH=$withval : rerun configure using --with-version-path to override default" >&2;} $as_echo "$as_me: WARNING: will use VERSIONPATH=$withval : rerun configure using --with-version-path to override default" >&2;}
VERSIONPATH="$withval" VERSIONPATH="$withval"
diff -wruN -x '*~' ../orig-modules-3.2.9/configure.ac ./configure.ac diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/configure.ac ./configure.ac
--- ../orig-modules-3.2.9/configure.ac 2011-11-28 23:57:59.000000000 +0100 --- ../orig-modules-3.2.10/configure.ac 2012-12-18 17:31:18.000000000 +0100
+++ ./configure.ac 2012-09-10 10:12:14.092802142 +0200 +++ ./configure.ac 2012-12-21 09:56:47.801240538 +0100
@@ -110,31 +110,31 @@ @@ -110,31 +110,31 @@
fi fi
if test "$prefix" != "NONE" ; then if test "$prefix" != "NONE" ; then
@ -145,7 +145,7 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/configure.ac ./configure.ac
export ac_default_prefix export ac_default_prefix
fi fi
PREFIX=$ac_default_prefix PREFIX=$ac_default_prefix
@@ -815,13 +815,13 @@ @@ -816,13 +816,13 @@
AH_TEMPLATE([MODULEPATH],[ AH_TEMPLATE([MODULEPATH],[
MODULEPATH: Directory that contains all the system module files])dnl MODULEPATH: Directory that contains all the system module files])dnl
AC_ARG_WITH(module-path, AC_ARG_WITH(module-path,
@ -161,7 +161,7 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/configure.ac ./configure.ac
AC_MSG_WARN([will use MODULEPATH=$withval : rerun configure using --with-module-path to override default]) AC_MSG_WARN([will use MODULEPATH=$withval : rerun configure using --with-module-path to override default])
MODULEPATH="$withval" MODULEPATH="$withval"
AC_DEFINE_UNQUOTED(MODULEPATH, "$withval"))dnl AC_DEFINE_UNQUOTED(MODULEPATH, "$withval"))dnl
@@ -832,14 +832,14 @@ @@ -833,14 +833,14 @@
AH_TEMPLATE([VERSIONPATH],[ AH_TEMPLATE([VERSIONPATH],[
VERSIONPATH: Directory that contains the env.modules version files.])dnl VERSIONPATH: Directory that contains the env.modules version files.])dnl
AC_ARG_WITH(version-path, AC_ARG_WITH(version-path,
@ -178,7 +178,7 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/configure.ac ./configure.ac
AC_MSG_WARN([will use VERSIONPATH=$withval : rerun configure using --with-version-path to override default]) AC_MSG_WARN([will use VERSIONPATH=$withval : rerun configure using --with-version-path to override default])
VERSIONPATH="$withval" VERSIONPATH="$withval"
AC_DEFINE_UNQUOTED(VERSIONPATH, "$withval") AC_DEFINE_UNQUOTED(VERSIONPATH, "$withval")
@@ -960,19 +960,19 @@ @@ -961,19 +961,19 @@
Depending on the above configuration options the files are approximately Depending on the above configuration options the files are approximately
placed in the following directory structure : placed in the following directory structure :
@ -201,9 +201,9 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/configure.ac ./configure.ac
]])dnl ]])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl Now put it all out! dnl Now put it all out!
diff -wruN -x '*~' ../orig-modules-3.2.9/etc/add.modules.in ./etc/add.modules.in diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/etc/add.modules.in ./etc/add.modules.in
--- ../orig-modules-3.2.9/etc/add.modules.in 2010-11-11 19:23:18.000000000 +0100 --- ../orig-modules-3.2.10/etc/add.modules.in 2012-11-01 23:22:06.000000000 +0100
+++ ./etc/add.modules.in 2012-09-10 10:19:36.291421512 +0200 +++ ./etc/add.modules.in 2012-12-21 09:56:47.801240538 +0100
@@ -144,7 +144,7 @@ @@ -144,7 +144,7 @@
-zsh|zsh|*/zsh) modules_shell=zsh ;; -zsh|zsh|*/zsh) modules_shell=zsh ;;
-bash|bash|*/bash) modules_shell=bash ;; -bash|bash|*/bash) modules_shell=bash ;;
@ -213,9 +213,9 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/etc/add.modules.in ./etc/add.modules.in
@NOTVERSIONING@module() { eval \`@bindir@/modulecmd \$modules_shell \$*\`; } @NOTVERSIONING@module() { eval \`@bindir@/modulecmd \$modules_shell \$*\`; }
! !
elif [ x$3 = xcsh ] elif [ x$3 = xcsh ]
diff -wruN -x '*~' ../orig-modules-3.2.9/etc/global/bashrc.in ./etc/global/bashrc.in diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/etc/global/bashrc.in ./etc/global/bashrc.in
--- ../orig-modules-3.2.9/etc/global/bashrc.in 2010-11-11 19:23:18.000000000 +0100 --- ../orig-modules-3.2.10/etc/global/bashrc.in 2012-10-25 21:32:01.000000000 +0200
+++ ./etc/global/bashrc.in 2012-09-10 10:20:00.468439340 +0200 +++ ./etc/global/bashrc.in 2012-12-21 09:56:47.805240699 +0100
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
-zsh|zsh|*/zsh) modules_shell=zsh ;; -zsh|zsh|*/zsh) modules_shell=zsh ;;
-bash|bash|*/bash) modules_shell=bash ;; -bash|bash|*/bash) modules_shell=bash ;;
@ -225,9 +225,9 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/etc/global/bashrc.in ./etc/global/bashr
@NOTVERSIONING@eval "module() { eval \`@bindir@/modulecmd $modules_shell \$*\`; }" @NOTVERSIONING@eval "module() { eval \`@bindir@/modulecmd $modules_shell \$*\`; }"
unset modules_shell unset modules_shell
diff -wruN -x '*~' ../orig-modules-3.2.9/etc/global/csh.cshrc.in ./etc/global/csh.cshrc.in diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/etc/global/csh.cshrc.in ./etc/global/csh.cshrc.in
--- ../orig-modules-3.2.9/etc/global/csh.cshrc.in 2002-06-14 08:15:20.000000000 +0200 --- ../orig-modules-3.2.10/etc/global/csh.cshrc.in 2012-10-25 21:32:01.000000000 +0200
+++ ./etc/global/csh.cshrc.in 2012-09-10 10:20:08.220765705 +0200 +++ ./etc/global/csh.cshrc.in 2012-12-21 09:56:47.805240699 +0100
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
set modules_shell="csh" set modules_shell="csh"
endif endif
@ -237,9 +237,9 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/etc/global/csh.cshrc.in ./etc/global/cs
@NOTVERSIONING@alias module 'eval `@bindir@/modulecmd '$modules_shell '\!*`' @NOTVERSIONING@alias module 'eval `@bindir@/modulecmd '$modules_shell '\!*`'
unset modules_shell unset modules_shell
diff -wruN -x '*~' ../orig-modules-3.2.9/etc/skel/.cshrc.in ./etc/skel/.cshrc.in diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/etc/skel/.cshrc.in ./etc/skel/.cshrc.in
--- ../orig-modules-3.2.9/etc/skel/.cshrc.in 2002-06-14 08:15:21.000000000 +0200 --- ../orig-modules-3.2.10/etc/skel/.cshrc.in 2012-10-25 21:32:01.000000000 +0200
+++ ./etc/skel/.cshrc.in 2012-09-10 10:21:44.688826752 +0200 +++ ./etc/skel/.cshrc.in 2012-12-21 09:56:47.805240699 +0100
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
else else
set modules_shell="csh" set modules_shell="csh"
@ -249,9 +249,9 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/etc/skel/.cshrc.in ./etc/skel/.cshrc.in
@NOTVERSIONING@alias module 'eval `@bindir@/modulecmd '$modules_shell '\!*`' @NOTVERSIONING@alias module 'eval `@bindir@/modulecmd '$modules_shell '\!*`'
if (! $?prompt) exit #exit if not interactive if (! $?prompt) exit #exit if not interactive
diff -wruN -x '*~' ../orig-modules-3.2.9/etc/skel/.kshenv.in ./etc/skel/.kshenv.in diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/etc/skel/.kshenv.in ./etc/skel/.kshenv.in
--- ../orig-modules-3.2.9/etc/skel/.kshenv.in 2002-06-14 08:15:21.000000000 +0200 --- ../orig-modules-3.2.10/etc/skel/.kshenv.in 2012-10-25 21:32:01.000000000 +0200
+++ ./etc/skel/.kshenv.in 2012-09-10 10:21:52.657162178 +0200 +++ ./etc/skel/.kshenv.in 2012-12-21 09:56:47.805240699 +0100
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
-ksh|ksh|*/ksh) modules_shell=ksh ;; -ksh|ksh|*/ksh) modules_shell=ksh ;;
-bash|bash|*/bash) modules_shell=bash ;; -bash|bash|*/bash) modules_shell=bash ;;
@ -261,9 +261,9 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/etc/skel/.kshenv.in ./etc/skel/.kshenv.
@NOTVERSIONING@eval "module() { eval `@bindir@/modulecmd $modules_shell $*`; }" @NOTVERSIONING@eval "module() { eval `@bindir@/modulecmd $modules_shell $*`; }"
unset modules_shell unset modules_shell
diff -wruN -x '*~' ../orig-modules-3.2.9/ext/common/.cshrc.in ./ext/common/.cshrc.in diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/ext/common/.cshrc.in ./ext/common/.cshrc.in
--- ../orig-modules-3.2.9/ext/common/.cshrc.in 2002-06-14 08:15:21.000000000 +0200 --- ../orig-modules-3.2.10/ext/common/.cshrc.in 2012-10-25 21:32:01.000000000 +0200
+++ ./ext/common/.cshrc.in 2012-09-10 10:21:06.015198726 +0200 +++ ./ext/common/.cshrc.in 2012-12-21 09:56:47.805240699 +0100
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
else else
set modules_shell="csh" set modules_shell="csh"
@ -273,9 +273,9 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/ext/common/.cshrc.in ./ext/common/.cshr
if ( -f $HOME/.cshrc.ext ) then if ( -f $HOME/.cshrc.ext ) then
source $HOME/.cshrc.ext source $HOME/.cshrc.ext
diff -wruN -x '*~' ../orig-modules-3.2.9/ext/common/.kshenv.in ./ext/common/.kshenv.in diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/ext/common/.kshenv.in ./ext/common/.kshenv.in
--- ../orig-modules-3.2.9/ext/common/.kshenv.in 2002-06-14 08:15:21.000000000 +0200 --- ../orig-modules-3.2.10/ext/common/.kshenv.in 2012-10-25 21:32:01.000000000 +0200
+++ ./ext/common/.kshenv.in 2012-09-10 10:21:12.871487357 +0200 +++ ./ext/common/.kshenv.in 2012-12-21 09:56:47.805240699 +0100
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
-ksh|ksh|*/ksh) modules_shell=ksh ;; -ksh|ksh|*/ksh) modules_shell=ksh ;;
-bash|bash|*/bash) modules_shell=bash ;; -bash|bash|*/bash) modules_shell=bash ;;
@ -285,9 +285,9 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/ext/common/.kshenv.in ./ext/common/.ksh
if [ -f ${ENV:-$HOME/.kshenv.ext} ]; then if [ -f ${ENV:-$HOME/.kshenv.ext} ]; then
. ${ENV:-$HOME/.kshenv.ext} . ${ENV:-$HOME/.kshenv.ext}
diff -wruN -x '*~' ../orig-modules-3.2.9/init/bash_completion.in ./init/bash_completion.in diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/init/bash_completion.in ./init/bash_completion.in
--- ../orig-modules-3.2.9/init/bash_completion.in 2010-07-27 21:09:06.000000000 +0200 --- ../orig-modules-3.2.10/init/bash_completion.in 2012-10-25 21:33:34.000000000 +0200
+++ ./init/bash_completion.in 2012-09-10 10:22:45.543388781 +0200 +++ ./init/bash_completion.in 2012-12-21 09:56:47.805240699 +0100
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
# Bash commandline completion (bash 3.0 and above) for Modules @VERSION@ # Bash commandline completion (bash 3.0 and above) for Modules @VERSION@
# #
@ -297,9 +297,9 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/init/bash_completion.in ./init/bash_com
@NOTVERSIONING@ @bindir@/modulecmd bash -t avail 2>&1 | sed ' @NOTVERSIONING@ @bindir@/modulecmd bash -t avail 2>&1 | sed '
/:$/d; /:$/d;
/:ERROR:/d; /:ERROR:/d;
diff -wruN -x '*~' ../orig-modules-3.2.9/init/bash.in ./init/bash.in diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/init/bash.in ./init/bash.in
--- ../orig-modules-3.2.9/init/bash.in 2010-11-11 19:23:18.000000000 +0100 --- ../orig-modules-3.2.10/init/bash.in 2012-10-25 21:33:34.000000000 +0200
+++ ./init/bash.in 2012-09-10 10:24:04.194703624 +0200 +++ ./init/bash.in 2012-12-21 09:56:47.805240699 +0100
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
@VERSIONING@fi @VERSIONING@fi
@VERSIONING@export MODULE_VERSION_STACK @VERSIONING@export MODULE_VERSION_STACK
@ -309,9 +309,9 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/init/bash.in ./init/bash.in
@NOTVERSIONING@module() { eval `@bindir@/modulecmd bash $*`; } @NOTVERSIONING@module() { eval `@bindir@/modulecmd bash $*`; }
export -f module export -f module
diff -wruN -x '*~' ../orig-modules-3.2.9/init/cmake.in ./init/cmake.in diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/init/cmake.in ./init/cmake.in
--- ../orig-modules-3.2.9/init/cmake.in 2010-11-11 19:23:18.000000000 +0100 --- ../orig-modules-3.2.10/init/cmake.in 2012-10-25 21:33:34.000000000 +0200
+++ ./init/cmake.in 2012-09-10 10:22:52.063663594 +0200 +++ ./init/cmake.in 2012-12-21 09:56:47.805240699 +0100
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
@VERSIONING@endif() @VERSIONING@endif()
@ -321,9 +321,9 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/init/cmake.in ./init/cmake.in
@NOTVERSIONING@ set(exec_prefix "@bindir@") @NOTVERSIONING@ set(exec_prefix "@bindir@")
diff -wruN -x '*~' ../orig-modules-3.2.9/init/csh.in ./init/csh.in diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/init/csh.in ./init/csh.in
--- ../orig-modules-3.2.9/init/csh.in 2010-11-11 19:23:18.000000000 +0100 --- ../orig-modules-3.2.10/init/csh.in 2012-10-25 21:33:34.000000000 +0200
+++ ./init/csh.in 2012-09-10 10:23:09.980418728 +0200 +++ ./init/csh.in 2012-12-21 09:56:47.805240699 +0100
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
@VERSIONING@ setenv MODULE_VERSION "@VERSION@" @VERSIONING@ setenv MODULE_VERSION "@VERSION@"
@VERSIONING@ setenv MODULE_VERSION_STACK "@VERSION@" @VERSIONING@ setenv MODULE_VERSION_STACK "@VERSION@"
@ -333,9 +333,9 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/init/csh.in ./init/csh.in
@NOTVERSIONING@set exec_prefix='@bindir@' @NOTVERSIONING@set exec_prefix='@bindir@'
set prefix="" set prefix=""
diff -wruN -x '*~' ../orig-modules-3.2.9/init/ksh.in ./init/ksh.in diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/init/ksh.in ./init/ksh.in
--- ../orig-modules-3.2.9/init/ksh.in 2010-11-11 19:23:18.000000000 +0100 --- ../orig-modules-3.2.10/init/ksh.in 2012-10-25 21:33:34.000000000 +0200
+++ ./init/ksh.in 2012-09-10 10:23:19.488819479 +0200 +++ ./init/ksh.in 2012-12-21 09:56:47.805240699 +0100
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
@VERSIONING@fi @VERSIONING@fi
@VERSIONING@export MODULE_VERSION_STACK @VERSIONING@export MODULE_VERSION_STACK
@ -345,9 +345,9 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/init/ksh.in ./init/ksh.in
@NOTVERSIONING@module() { eval `@bindir@/modulecmd ksh $*`; } @NOTVERSIONING@module() { eval `@bindir@/modulecmd ksh $*`; }
MODULESHOME=@prefix@ MODULESHOME=@prefix@
diff -wruN -x '*~' ../orig-modules-3.2.9/init/.modulespath.in ./init/.modulespath.in diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/init/.modulespath.in ./init/.modulespath.in
--- ../orig-modules-3.2.9/init/.modulespath.in 2010-11-11 19:23:18.000000000 +0100 --- ../orig-modules-3.2.10/init/.modulespath.in 2012-11-01 23:23:23.000000000 +0100
+++ ./init/.modulespath.in 2012-09-10 10:28:34.310087174 +0200 +++ ./init/.modulespath.in 2012-12-21 09:56:47.805240699 +0100
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
# limited by the maximum variable size of your shell. # limited by the maximum variable size of your shell.
# #
@ -358,9 +358,9 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/init/.modulespath.in ./init/.modulespat
+@NOTVERSIONING@@BASEPREFIX@/share/Modules/modulefiles # Module pkg modulefiles (if no versioning) +@NOTVERSIONING@@BASEPREFIX@/share/Modules/modulefiles # Module pkg modulefiles (if no versioning)
@MODULEPATH@ # General module files @MODULEPATH@ # General module files
#@prefix@/your_contribs # Edit for your requirements #@prefix@/your_contribs # Edit for your requirements
diff -wruN -x '*~' ../orig-modules-3.2.9/init/perl.pm.in ./init/perl.pm.in diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/init/perl.pm.in ./init/perl.pm.in
--- ../orig-modules-3.2.9/init/perl.pm.in 2010-11-11 19:23:18.000000000 +0100 --- ../orig-modules-3.2.10/init/perl.pm.in 2012-11-01 17:58:27.000000000 +0100
+++ ./init/perl.pm.in 2012-09-10 10:23:23.744998856 +0200 +++ ./init/perl.pm.in 2012-12-21 09:56:47.805240699 +0100
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
sub module { sub module {
@ -370,9 +370,9 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/init/perl.pm.in ./init/perl.pm.in
@VERSIONING@ eval `$exec_prefix/bin/modulecmd perl @_`; @VERSIONING@ eval `$exec_prefix/bin/modulecmd perl @_`;
@NOTVERSIONING@ $exec_prefix = "@bindir@"; @NOTVERSIONING@ $exec_prefix = "@bindir@";
diff -wruN -x '*~' ../orig-modules-3.2.9/init/python.py.in ./init/python.py.in diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/init/python.py.in ./init/python.py.in
--- ../orig-modules-3.2.9/init/python.py.in 2010-11-11 19:23:18.000000000 +0100 --- ../orig-modules-3.2.10/init/python.py.in 2012-10-25 21:33:34.000000000 +0200
+++ ./init/python.py.in 2012-09-10 10:23:32.481367054 +0200 +++ ./init/python.py.in 2012-12-21 09:56:47.805240699 +0100
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
args = args[0] args = args[0]
else: else:
@ -382,9 +382,9 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/init/python.py.in ./init/python.py.in
@NOTVERSIONING@ (output, error) = subprocess.Popen(['@bindir@/modulecmd', 'python'] + @NOTVERSIONING@ (output, error) = subprocess.Popen(['@bindir@/modulecmd', 'python'] +
args, stdout=subprocess.PIPE).communicate() args, stdout=subprocess.PIPE).communicate()
exec output exec output
diff -wruN -x '*~' ../orig-modules-3.2.9/init/ruby.rb.in ./init/ruby.rb.in diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/init/ruby.rb.in ./init/ruby.rb.in
--- ../orig-modules-3.2.9/init/ruby.rb.in 2011-10-17 18:45:40.000000000 +0200 --- ../orig-modules-3.2.10/init/ruby.rb.in 2012-10-25 21:32:01.000000000 +0200
+++ ./init/ruby.rb.in 2012-09-10 10:23:37.937597014 +0200 +++ ./init/ruby.rb.in 2012-12-21 09:56:47.805240699 +0100
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
else else
args = args.join(" ") args = args.join(" ")
@ -394,9 +394,9 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/init/ruby.rb.in ./init/ruby.rb.in
@VERSIONING@ eval `#{exec_prefix}/bin/modulecmd ruby #{args}` @VERSIONING@ eval `#{exec_prefix}/bin/modulecmd ruby #{args}`
@NOTVERSIONING@ exec_prefix = "@bindir@" @NOTVERSIONING@ exec_prefix = "@bindir@"
diff -wruN -x '*~' ../orig-modules-3.2.9/init/sh.in ./init/sh.in diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/init/sh.in ./init/sh.in
--- ../orig-modules-3.2.9/init/sh.in 2010-11-11 19:23:18.000000000 +0100 --- ../orig-modules-3.2.10/init/sh.in 2012-10-25 21:33:34.000000000 +0200
+++ ./init/sh.in 2012-09-10 10:23:45.521916658 +0200 +++ ./init/sh.in 2012-12-21 09:56:47.805240699 +0100
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
@VERSIONING@fi @VERSIONING@fi
@VERSIONING@export MODULE_VERSION_STACK @VERSIONING@export MODULE_VERSION_STACK
@ -406,9 +406,9 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/init/sh.in ./init/sh.in
@NOTVERSIONING@module() { eval `@bindir@/modulecmd sh $*`; } @NOTVERSIONING@module() { eval `@bindir@/modulecmd sh $*`; }
MODULESHOME=@prefix@ MODULESHOME=@prefix@
diff -wruN -x '*~' ../orig-modules-3.2.9/init/zsh.in ./init/zsh.in diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/init/zsh.in ./init/zsh.in
--- ../orig-modules-3.2.9/init/zsh.in 2010-11-11 19:23:18.000000000 +0100 --- ../orig-modules-3.2.10/init/zsh.in 2012-10-25 21:33:34.000000000 +0200
+++ ./init/zsh.in 2012-09-10 10:23:53.082235275 +0200 +++ ./init/zsh.in 2012-12-21 09:56:47.805240699 +0100
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
@VERSIONING@fi @VERSIONING@fi
@VERSIONING@export MODULE_VERSION_STACK @VERSIONING@export MODULE_VERSION_STACK
@ -418,9 +418,9 @@ diff -wruN -x '*~' ../orig-modules-3.2.9/init/zsh.in ./init/zsh.in
@NOTVERSIONING@module() { eval `@bindir@/modulecmd zsh $*`; } @NOTVERSIONING@module() { eval `@bindir@/modulecmd zsh $*`; }
MODULESHOME=@prefix@ MODULESHOME=@prefix@
diff -wruN -x '*~' ../orig-modules-3.2.9/INSTALL ./INSTALL diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-modules-3.2.10/INSTALL ./INSTALL
--- ../orig-modules-3.2.9/INSTALL 2006-01-12 20:14:24.000000000 +0100 --- ../orig-modules-3.2.10/INSTALL 2012-10-25 21:32:01.000000000 +0200
+++ ./INSTALL 2012-09-10 10:12:14.056800627 +0200 +++ ./INSTALL 2012-12-21 09:56:47.805240699 +0100
@@ -103,7 +103,7 @@ @@ -103,7 +103,7 @@
your system root, else it may get wiped out with every OS upgrade. your system root, else it may get wiped out with every OS upgrade.
The default is /usr/local/Modules/modulefiles/. You will use the The default is /usr/local/Modules/modulefiles/. You will use the