rpms/environment-modules/EL-4 modules-3.2.6-versioning.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 environment-modules.spec, 1.12, 1.13 sources, 1.7, 1.8
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Wed Mar 5 20:12:13 UTC 2008
- Previous message (by thread): rpms/environment-modules/devel modules-3.2.6-versioning.patch, NONE, 1.1 environment-modules.spec, 1.14, 1.15
- Next message (by thread): rpms/environment-modules/EL-5 modules-3.2.6-versioning.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 environment-modules.spec, 1.10, 1.11 sources, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: orion
Update of /cvs/pkgs/rpms/environment-modules/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25608/EL-4
Modified Files:
.cvsignore environment-modules.spec sources
Added Files:
modules-3.2.6-versioning.patch
Log Message:
Sync to devel
modules-3.2.6-versioning.patch:
--- NEW FILE modules-3.2.6-versioning.patch ---
--- modules-3.2.6/modulefiles/modules.in.versioning 2007-03-25 08:24:51.000000000 -0600
+++ modules-3.2.6/modulefiles/modules.in 2008-03-05 10:32:38.000000000 -0700
@@ -24,5 +24,5 @@
prepend-path PATH $modroot/bin
prepend-path MANPATH $modroot/share/man
-module use @VERSIONPATH@
+ at VERSIONING@module use @VERSIONPATH@
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/EL-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 16 Feb 2007 18:58:44 -0000 1.7
+++ .cvsignore 5 Mar 2008 20:11:29 -0000 1.8
@@ -1 +1 @@
-modules-3.2.5.tar.bz2
+modules-3.2.6.tar.bz2
Index: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/EL-4/environment-modules.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- environment-modules.spec 21 Aug 2007 20:35:23 -0000 1.12
+++ environment-modules.spec 5 Mar 2008 20:11:29 -0000 1.13
@@ -1,12 +1,13 @@
Name: environment-modules
-Version: 3.2.5
-Release: 2%{?dist}
+Version: 3.2.6
+Release: 4%{?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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: tcl-devel, tclx-devel
@@ -35,12 +36,14 @@
%prep
%setup -q -n modules-%{version}
+%patch -p1 -b .versioning
%build
%configure --disable-versioning --prefix=%{_datadir} \
--exec-prefix=%{_datadir}/Modules \
- --with-version-path=%{_datadir}/Modules/modulefiles
+ --with-module-path=%{_sysconfdir}/modulefiles
+# --with-debug=42 --with-log-facility-debug=stderr
make %{?_smp_mflags}
@@ -50,6 +53,7 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
ln -s %{_datadir}/Modules/init/bash $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
%clean
@@ -59,6 +63,7 @@
%files
%defattr(-,root,root,-)
%doc LICENSE.GPL README TODO
+%{_sysconfdir}/modulefiles
%{_sysconfdir}/profile.d/*
%{_bindir}/modulecmd
%{_datadir}/Modules/
@@ -67,6 +72,20 @@
%changelog
+* Wed Mar 5 2008 - Orion Poplawski <orion at cora.nwra.com> - 3.2.6-4
+- Add patch to fix extraneous version path entry properly
+- Use --with-module-path to point to /etc/modulefiles for local modules,
+ this also fixes bug #436041
+
+* Sat Feb 9 2008 - Orion Poplawski <orion at cora.nwra.com> - 3.2.6-3
+- Rebuild for gcc 3.4
+
+* Thu Jan 03 2008 - Alex Lancaster <alexlan at fedoraproject.org> - 3.2.6-2
+- Rebuild for new Tcl (8.5).
+
+* Fri Nov 2 2007 - Orion Poplawski <orion at cora.nwra.com> - 3.2.6-1
+- Update to 3.2.6
+
* Tue Aug 21 2007 - Orion Poplawski <orion at cora.nwra.com> - 3.2.5-2
- Update license tag to GPLv2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/EL-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 16 Feb 2007 18:58:44 -0000 1.7
+++ sources 5 Mar 2008 20:11:29 -0000 1.8
@@ -1 +1 @@
-4eff5018b9c870af44940e81ccb11813 modules-3.2.5.tar.bz2
+59bc6401efbc677d6190b00a440cccdf modules-3.2.6.tar.bz2
- Previous message (by thread): rpms/environment-modules/devel modules-3.2.6-versioning.patch, NONE, 1.1 environment-modules.spec, 1.14, 1.15
- Next message (by thread): rpms/environment-modules/EL-5 modules-3.2.6-versioning.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 environment-modules.spec, 1.10, 1.11 sources, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list