forked from pool/Modules
Accepting request 131985 from home:ealin:branches:systemsmanagement
please forward to factory - update to 3.2.9c * Fix the coexistence of load/remove flags (Martin Siegert) * Fixed an overlapping string copy (Wilson Snyder & Orion Poplawski) * Isolated calls to the new interpreter and get & set env.vars. * Crucial bug fix of same by (Orion Poplawski). * Optionally use Tcl memory check routines for malloc/realloc. * Fixed the "module purge" memory corruption (Poor Yorick) * Added support for Ruby (Tammo Tjarks) - replace defaut in the profile files with the proper version - make module files from /etc %config OBS-URL: https://build.opensuse.org/request/show/131985 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/Modules?expand=0&rev=10
This commit is contained in:
parent
f773069115
commit
091c15bd4a
@ -1,4 +1,16 @@
|
|||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
|
Wed Aug 29 20:11:14 UTC 2012 - alinm.elena@gmail.com
|
||||||
|
- update to 3.2.9c
|
||||||
|
* Fix the coexistence of load/remove flags (Martin Siegert)
|
||||||
|
* Fixed an overlapping string copy (Wilson Snyder & Orion Poplawski)
|
||||||
|
* Isolated calls to the new interpreter and get & set env.vars.
|
||||||
|
* Crucial bug fix of same by (Orion Poplawski).
|
||||||
|
* Optionally use Tcl memory check routines for malloc/realloc.
|
||||||
|
* Fixed the "module purge" memory corruption (Poor Yorick)
|
||||||
|
* Added support for Ruby (Tammo Tjarks)
|
||||||
|
- replace defaut in the profile files with the proper version
|
||||||
|
- make module files from /etc %config
|
||||||
|
-------------------------------------------------------------------
|
||||||
Thu Dec 1 11:19:55 UTC 2011 - coolo@suse.com
|
Thu Dec 1 11:19:55 UTC 2011 - coolo@suse.com
|
||||||
|
|
||||||
- add automake as buildrequire to avoid implicit dependency
|
- add automake as buildrequire to avoid implicit dependency
|
||||||
|
22
Modules.spec
22
Modules.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package Modules
|
# spec file for package Modules
|
||||||
#
|
#
|
||||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -15,19 +15,23 @@
|
|||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
Name: Modules
|
Name: Modules
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: tcl-devel
|
BuildRequires: tcl-devel
|
||||||
# xorg-x11-devel
|
# xorg-x11-devel
|
||||||
Url: http://modules.sourceforge.net/
|
Url: http://modules.sourceforge.net/
|
||||||
Version: 3.2.8
|
Version: 3.2.9
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Environment Modules
|
Summary: Environment Modules
|
||||||
License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+
|
License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+
|
||||||
Group: System/Management
|
Group: System/Management
|
||||||
Requires: tcl
|
Requires: tcl
|
||||||
Source: modules-%{version}a.tar.bz2
|
Source: modules-%{version}c.tar.bz2
|
||||||
Patch: modules-%{version}.patch
|
# PATCH-FIX-OPENSUSE share.patch
|
||||||
|
Patch0: share.patch
|
||||||
|
# PATCH-FIX-UPSTREAM return.patch
|
||||||
|
Patch1: return.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
Provides: environment-modules
|
Provides: environment-modules
|
||||||
Obsoletes: environment-modules
|
Obsoletes: environment-modules
|
||||||
@ -55,7 +59,8 @@ Authors:
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n modules-%{version}
|
%setup -q -n modules-%{version}
|
||||||
%patch -p1
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
aclocal --force -I config
|
aclocal --force -I config
|
||||||
@ -76,6 +81,9 @@ install -d $RPM_BUILD_ROOT/usr/share/modules
|
|||||||
install -d $RPM_BUILD_ROOT/etc/profile.d
|
install -d $RPM_BUILD_ROOT/etc/profile.d
|
||||||
install -m 644 etc/global/profile.modules $RPM_BUILD_ROOT/etc/profile.d/modules.sh
|
install -m 644 etc/global/profile.modules $RPM_BUILD_ROOT/etc/profile.d/modules.sh
|
||||||
install -m 644 etc/global/csh.modules $RPM_BUILD_ROOT/etc/profile.d/modules.csh
|
install -m 644 etc/global/csh.modules $RPM_BUILD_ROOT/etc/profile.d/modules.csh
|
||||||
|
sed -i "s;/default/;/%{version}/;g" $RPM_BUILD_ROOT/etc/profile.d/modules.sh
|
||||||
|
sed -i "s;/default/;/%{version}/;g" $RPM_BUILD_ROOT/etc/profile.d/modules.csh
|
||||||
|
|
||||||
make DESTDIR=$RPM_BUILD_ROOT install
|
make DESTDIR=$RPM_BUILD_ROOT install
|
||||||
install -d $RPM_BUILD_ROOT/usr/bin
|
install -d $RPM_BUILD_ROOT/usr/bin
|
||||||
pushd $RPM_BUILD_ROOT/usr/bin
|
pushd $RPM_BUILD_ROOT/usr/bin
|
||||||
@ -95,7 +103,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%dir /usr/share/modules
|
%dir /usr/share/modules
|
||||||
/usr/share/modules/*
|
/usr/share/modules/*
|
||||||
%{_bindir}/*
|
%{_bindir}/*
|
||||||
/etc/profile.d/modules.*
|
%config /etc/profile.d/modules.*
|
||||||
%doc %{_mandir}/man4/*
|
%doc %{_mandir}/man4/*
|
||||||
%doc %{_mandir}/man1/*
|
%doc %{_mandir}/man1/*
|
||||||
|
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:9c47d18aa29b94c5964a79e0dc06facb928911355ab904aa27955cb39ec4173f
|
|
||||||
size 336840
|
|
3
modules-3.2.9c.tar.bz2
Normal file
3
modules-3.2.9c.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:142cfbf71e33ac8a4506d71dd650d1b613999538b5b0bcb7f24167e3600e6502
|
||||||
|
size 359384
|
10
return.patch
Normal file
10
return.patch
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
--- a/ModuleCmd_Avail.c.old 2012-08-29 01:06:16.176859774 +0100
|
||||||
|
+++ b/ModuleCmd_Avail.c 2012-08-29 01:06:52.540527924 +0100
|
||||||
|
@@ -680,6 +680,7 @@ static int check_cache( char *dir)
|
||||||
|
|
||||||
|
static int test_version_dir( struct dirent *dp)
|
||||||
|
{
|
||||||
|
+ return 0;
|
||||||
|
}
|
||||||
|
/*++++
|
||||||
|
** ** Function-Header ***************************************************** **
|
@ -1,7 +1,6 @@
|
|||||||
diff -wruN -x '*~' ../orig-modules-3.2.8/configure.ac ./configure.ac
|
--- a/configure.ac.old 2012-08-29 01:08:43.401494114 +0100
|
||||||
--- ../orig-modules-3.2.8/configure.ac 2010-10-04 17:59:50.000000000 +0200
|
+++ b/configure.ac 2012-08-29 01:14:18.310729106 +0100
|
||||||
+++ ./configure.ac 2011-10-18 14:50:35.000000000 +0200
|
@@ -110,10 +110,10 @@ must disable with --disable-versioning ]
|
||||||
@@ -110,10 +110,10 @@
|
|
||||||
fi
|
fi
|
||||||
if test "$prefix" != "NONE" ; then
|
if test "$prefix" != "NONE" ; then
|
||||||
if test "$WANTS_VERSIONING" -eq 1 ; then
|
if test "$WANTS_VERSIONING" -eq 1 ; then
|
||||||
@ -15,7 +14,7 @@ diff -wruN -x '*~' ../orig-modules-3.2.8/configure.ac ./configure.ac
|
|||||||
export prefix
|
export prefix
|
||||||
else
|
else
|
||||||
DEFAULTPATH=$prefix/Modules
|
DEFAULTPATH=$prefix/Modules
|
||||||
@@ -125,10 +125,10 @@
|
@@ -125,10 +125,10 @@ if test "$prefix" != "NONE" ; then
|
||||||
PREFIX=$prefix
|
PREFIX=$prefix
|
||||||
else
|
else
|
||||||
if test "$WANTS_VERSIONING" -eq 1 ; then
|
if test "$WANTS_VERSIONING" -eq 1 ; then
|
||||||
@ -29,14 +28,3 @@ diff -wruN -x '*~' ../orig-modules-3.2.8/configure.ac ./configure.ac
|
|||||||
export ac_default_prefix
|
export ac_default_prefix
|
||||||
else
|
else
|
||||||
DEFAULTPATH=$ac_default_prefix/Modules
|
DEFAULTPATH=$ac_default_prefix/Modules
|
||||||
diff -wruN -x '*~' ../orig-modules-3.2.8/ModuleCmd_Avail.c ./ModuleCmd_Avail.c
|
|
||||||
--- ../orig-modules-3.2.8/ModuleCmd_Avail.c 2010-07-27 21:09:05.000000000 +0200
|
|
||||||
+++ ./ModuleCmd_Avail.c 2011-10-18 12:21:15.000000000 +0200
|
|
||||||
@@ -680,6 +680,7 @@
|
|
||||||
|
|
||||||
static int test_version_dir( struct dirent *dp)
|
|
||||||
{
|
|
||||||
+ return 0;
|
|
||||||
}
|
|
||||||
/*++++
|
|
||||||
** ** Function-Header ***************************************************** **
|
|
Loading…
Reference in New Issue
Block a user