rpms/environment-modules/F-11 modules.sh, NONE, 1.1 environment-modules.spec, 1.21, 1.22 import.log, 1.3, 1.4

[Orion Poplawski]

Author: orion

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

Modified Files:
	environment-modules.spec import.log 
Added Files:
	modules.sh 
Log Message:
Sync from devel


--- NEW FILE modules.sh ---
. /usr/share/Modules/init/`basename $SHELL`


Index: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-11/environment-modules.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- environment-modules.spec	23 Sep 2009 20:00:48 -0000	1.21
+++ environment-modules.spec	19 Oct 2009 16:40:43 -0000	1.22
@@ -1,12 +1,13 @@
 Name:           environment-modules
 Version:        3.2.7b
-Release:        2%{?dist}
+Release:        3%{?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
+Source1:        modules.sh
 Patch0:         environment-modules-3.2.7-bindir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -56,7 +57,7 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-ln -s %{_datadir}/Modules/init/bash $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.sh
+cp -p %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.sh
 ln -s %{_datadir}/Modules/init/csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.csh
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modulefiles
 
@@ -77,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 19 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-3
+- Support different flavors of "sh" (bug #529493)
+
 * Wed Sep 23 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-2
 - Add patch to fix modulecmd path in init files
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	23 Sep 2009 20:00:48 -0000	1.3
+++ import.log	19 Oct 2009 16:40:43 -0000	1.4
@@ -1,3 +1,4 @@
 environment-modules-3_2_7-1_fc12:F-11:environment-modules-3.2.7-1.fc12.src.rpm:1253552344
 environment-modules-3_2_7b-1_fc12:F-11:environment-modules-3.2.7b-1.fc12.src.rpm:1253719416
 environment-modules-3_2_7b-2_fc12:F-11:environment-modules-3.2.7b-2.fc12.src.rpm:1253735985
+environment-modules-3_2_7b-3_fc13:F-11:environment-modules-3.2.7b-3.fc13.src.rpm:1255970373