SHA256
1
0
forked from pool/Modules

Accepting request 263281 from systemsmanagement

1

OBS-URL: https://build.opensuse.org/request/show/263281
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Modules?expand=0&rev=21
This commit is contained in:
Dominique Leuenberger 2014-12-03 21:49:41 +00:00 committed by Git OBS Bridge
commit 7a809c1d95
3 changed files with 21 additions and 0 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Nov 16 20:50:00 UTC 2014 - Led <ledest@gmail.com>
- fix bashism in add.modules script
- add patches:
* modules-3.2.10-fix-bashisms.patch
-------------------------------------------------------------------
Tue Aug 26 10:50:58 UTC 2014 - jengelh@inai.de

View File

@ -32,6 +32,7 @@ Source: modules-%{version}.tar.bz2
Patch0: share.patch
# PATCH-FIX-UPSTREAM return.patch
Patch1: return.patch
Patch2: modules-3.2.10-fix-bashisms.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: environment-modules
Obsoletes: environment-modules < %{version}
@ -61,6 +62,7 @@ Authors:
%setup -q -n modules-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
# Remove overzealous use of "dnl" (+++), which caused

View File

@ -0,0 +1,12 @@
diff -Ndur modules-3.2.10/etc/add.modules.in modules-3.2.10-fix-bashisms/etc/add.modules.in
--- modules-3.2.10/etc/add.modules.in 2012-11-02 00:22:06.000000000 +0200
+++ modules-3.2.10-fix-bashisms/etc/add.modules.in 2014-11-16 22:48:55.863380526 +0200
@@ -114,7 +114,7 @@
findload $1.old
/bin/cat > $1 <<!
if ( -e $ETC/csh.modules ) then
- source $ETC/csh.modules
+ . $ETC/csh.modules
# put your own module loads here
!
if [ -s /tmp/load.$$ ]