- Support different flavors of "sh" (bug #529493)

This commit is contained in:
Orion Poplawski 2009-10-19 16:34:46 +00:00
parent 8eef353b20
commit ffedddb393
2 changed files with 7 additions and 2 deletions

View File

@ -1,12 +1,13 @@
Name: environment-modules Name: environment-modules
Version: 3.2.7b Version: 3.2.7b
Release: 2%{?dist} Release: 3%{?dist}
Summary: Provides dynamic modification of a user's environment Summary: Provides dynamic modification of a user's environment
Group: System Environment/Base Group: System Environment/Base
License: GPLv2+ License: GPLv2+
URL: http://modules.sourceforge.net/ URL: http://modules.sourceforge.net/
Source0: http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2 Source0: http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2
Source1: modules.sh
Patch0: environment-modules-3.2.7-bindir.patch Patch0: environment-modules-3.2.7-bindir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -56,7 +57,7 @@ make %{?_smp_mflags}
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d 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 ln -s %{_datadir}/Modules/init/csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.csh
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modulefiles mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modulefiles
@ -77,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Oct 19 2009 Orion Poplawski <orion@cora.nwra.com> - 3.2.7b-3
- Support different flavors of "sh" (bug #529493)
* Wed Sep 23 2009 Orion Poplawski <orion@cora.nwra.com> - 3.2.7b-2 * Wed Sep 23 2009 Orion Poplawski <orion@cora.nwra.com> - 3.2.7b-2
- Add patch to fix modulecmd path in init files - Add patch to fix modulecmd path in init files

1
modules.sh Normal file
View File

@ -0,0 +1 @@
. /usr/share/Modules/init/`basename $SHELL`