- Update to 3.2.7b

.cvsignore

@@ -1 +1 @@
-modules-3.2.7.tar.bz2
+modules-3.2.7b.tar.bz2

bash_completion.in

@@ -1,77 +0,0 @@
-#
-# Bash commandline completion (bash 3.0 and above) for Modules @VERSION@
-#
-_module_avail() {
-@VERSIONING@	@BASEPREFIX@/Modules/@VERSION@/bin/modulecmd bash -t avail 2>&1 | sed '
-@NOTVERSIONING@	@bindir@/modulecmd bash -t avail 2>&1 | sed '
-		/:$/d;
-		/:ERROR:/d;
-		s#^\(.*\)/\(.\+\)(default)#\1\n\1\/\2#;
-		s#/(default)##g;
-		s#/*$##g;'
-}
-
-_module_not_yet_loaded() {
-	comm -23  <(_module_avail|sort)  <(tr : '\n' <<<${LOADEDMODULES}|sort)
-}
-
-_module_long_arg_list() {
-	local cur="$1" i
-
-	if [[ ${COMP_WORDS[COMP_CWORD-2]} == sw* ]]
-	then
-		COMPREPLY=( $(compgen -W "$(_module_not_yet_loaded)" -- "$cur") )
-		return
-	fi
-	for ((i = COMP_CWORD - 1; i > 0; i--))
-	do case ${COMP_WORDS[$i]} in
-	   add|load)
-		COMPREPLY=( $(compgen -W "$(_module_not_yet_loaded)" -- "$cur") )
-		break;;
-	   rm|remove|unload|switch|swap)
-		COMPREPLY=( $(IFS=: compgen -W "${LOADEDMODULES}" -- "$cur") )
-		break;;
-	   esac
-	done
-}
-
-_module() {
-	local cur="$2" prev="$3" cmds opts
-
-	COMPREPLY=()
-
-	cmds="add apropos avail clear display help\
-	      initadd initclear initlist initprepend initrm initswitch\
-	      keyword list load purge refresh rm show swap switch\
-	      unload unuse update use whatis"
-
-	opts="-c -f -h -i -l -s -t -u -v -H -V\
-	      --create --force  --help  --human   --icase\
-	      --long   --silent --terse --userlvl --verbose --version"
-
-	case "$prev" in
-	add|load)	COMPREPLY=( $(compgen -W "$(_module_not_yet_loaded)" -- "$cur") );;
-	rm|remove|unload|switch|swap)
-			COMPREPLY=( $(IFS=: compgen -W "${LOADEDMODULES}" -- "$cur") );;
-	unuse)		COMPREPLY=( $(IFS=: compgen -W "${MODULEPATH}" -- "$cur") );;
-	use|*-a*)	;;			# let readline handle the completion
-	-u|--userlvl)	COMPREPLY=( $(compgen -W "novice expert advanced" -- "$cur") );;
-	display|help|show|whatis)
-			COMPREPLY=( $(compgen -W "$(_module_avail)" -- "$cur") );;
-	*) if test $COMP_CWORD -gt 2
-	   then
-		_module_long_arg_list "$cur"
-	   else
-		case "$cur" in
-		# The mappings below are optional abbreviations for convenience
-		ls)	COMPREPLY="list";;	# map ls -> list
-		r*)	COMPREPLY="rm";;	# also covers 'remove'
-		sw*)	COMPREPLY="switch";;
-
-		-*)	COMPREPLY=( $(compgen -W "$opts" -- "$cur") );;
-		*)	COMPREPLY=( $(compgen -W "$cmds" -- "$cur") );;
-		esac
-	   fi;;
-	esac
-}
-complete -o default -F _module module

environment-modules.spec

@@ -1,5 +1,5 @@
 Name:           environment-modules
-Version:        3.2.7
+Version:        3.2.7b
 Release:        1%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
@@ -7,8 +7,6 @@ Group:          System Environment/Base
 License:        GPLv2+
 URL:            http://modules.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2
-#Pulled this from current CVS, missing from 3.2.7 tarball
-Source1:        bash_completion.in
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  tcl-devel, tclx-devel, libX11-devel
@@ -39,8 +37,7 @@ have access to the module alias.
 
 
 %prep
-%setup -q -n modules-%{version}
+%setup -q -n modules-3.2.7
-cp -p %SOURCE1 init/
 
 
 %build
@@ -76,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 23 2009 Orion Poplawski <orion@cora.nwra.com> - 3.2.7b-1
+- Update to 3.2.7b
+
 * Mon Sep 21 2009 Orion Poplawski <orion@cora.nwra.com> - 3.2.7-1
 - Update to 3.2.7, fixes bug #524475
 - Drop versioning patch fixed upstream

sources

@@ -1 +1 @@
-ab3b3be9e5d4938a10281c7e194b3709  modules-3.2.7.tar.bz2
+3ebba50a1f79e63aa9e2189e9e6c7952  modules-3.2.7b.tar.bz2