rpms/environment-modules/devel modules-3.2.6-versioning.patch, NONE, 1.1 environment-modules.spec, 1.14, 1.15

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/pkgs/rpms/environment-modules/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24857

Modified Files:
	environment-modules.spec 
Added Files:
	modules-3.2.6-versioning.patch 
Log Message:
* 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


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: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/devel/environment-modules.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- environment-modules.spec	9 Feb 2008 17:35:21 -0000	1.14
+++ environment-modules.spec	5 Mar 2008 20:06:24 -0000	1.15
@@ -1,12 +1,13 @@
 Name:           environment-modules
 Version:        3.2.6
-Release:        3%{?dist}
+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,7 +72,12 @@
 
 
 %changelog
-* Sat Feb  9 2008 - Orion Poplawski <orion at cora.nwra.com> - 3.2.6-2
+* 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