rpms/environment-modules/F-11 bash_completion.in, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.8, 1.9 environment-modules.spec, 1.18, 1.19 sources, 1.8, 1.9 modules-3.2.6-versioning.patch, 1.1, NONE

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/environment-modules/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23958/F-11

Modified Files:
	.cvsignore environment-modules.spec sources 
Added Files:
	bash_completion.in import.log 
Removed Files:
	modules-3.2.6-versioning.patch 
Log Message:
* Mon Sep 21 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7-1
- Update to 3.2.7, fixes bug #524475
- Drop versioning patch fixed upstream



--- NEW FILE bash_completion.in ---
#
# 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


--- NEW FILE import.log ---
environment-modules-3_2_7-1_fc12:F-11:environment-modules-3.2.7-1.fc12.src.rpm:1253552344


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	2 Nov 2007 18:06:34 -0000	1.8
+++ .cvsignore	21 Sep 2009 16:59:34 -0000	1.9
@@ -1 +1 @@
-modules-3.2.6.tar.bz2
+modules-3.2.7.tar.bz2


Index: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-11/environment-modules.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- environment-modules.spec	24 Feb 2009 15:09:11 -0000	1.18
+++ environment-modules.spec	21 Sep 2009 16:59:34 -0000	1.19
@@ -1,13 +1,14 @@
 Name:           environment-modules
-Version:        3.2.6
-Release:        7%{?dist}
+Version:        3.2.7
+Release:        1%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
 Group:          System Environment/Base
 License:        GPLv2+
 URL:            http://modules.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2
-Patch0:         modules-3.2.6-versioning.patch
+#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
@@ -33,10 +34,13 @@ Modules are useful in managing different
 Modules can also be bundled into metamodules that will load an entire
 suite of different applications.
 
+NOTE: You will need to get a new shell after installing this package to
+have access to the module alias.
+
 
 %prep
 %setup -q -n modules-%{version}
-%patch0 -p1 -b .versioning
+cp -p %SOURCE1 init/
 
 
 %build
@@ -72,6 +76,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 21 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7-1
+- Update to 3.2.7, fixes bug #524475
+- Drop versioning patch fixed upstream
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.6-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.6-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	2 Nov 2007 18:06:34 -0000	1.8
+++ sources	21 Sep 2009 16:59:34 -0000	1.9
@@ -1 +1 @@
-59bc6401efbc677d6190b00a440cccdf  modules-3.2.6.tar.bz2
+ab3b3be9e5d4938a10281c7e194b3709  modules-3.2.7.tar.bz2


--- modules-3.2.6-versioning.patch DELETED ---