rpms/environment-modules/F-11 environment-modules-3.2.7-bindir.patch, NONE, 1.1 environment-modules.spec, 1.20, 1.21 import.log, 1.2, 1.3

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/environment-modules/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17850/F-11

Modified Files:
	environment-modules.spec import.log 
Added Files:
	environment-modules-3.2.7-bindir.patch 
Log Message:
Add patch to fix modulecmd path in init files

environment-modules-3.2.7-bindir.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE environment-modules-3.2.7-bindir.patch ---
--- modules-3.2.7/init/Makefile.in.bindir	2009-09-22 12:13:52.000000000 -0600
+++ modules-3.2.7/init/Makefile.in	2009-09-23 12:19:50.797470155 -0600
@@ -404,7 +404,7 @@
 	sed -e "/@$(if $(subst 0,,$(WANTS_VERSIONING)),NOT,)VERSIONING\@/d; \
 	s,@$(if $(subst 0,,$(WANTS_VERSIONING)),,NOT)VERSIONING\@,,g; \
 	s, at prefix\@,${prefix},g; \
-	s, at bindir\@,${exec_prefix}/bin,g; \
+	s, at bindir\@,${bindir},g; \
 	s, at VERSION\@, at VERSION@,g; \
 	s, at BASEPREFIX\@, at BASEPREFIX@,g;" < $< > $@
 


Index: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-11/environment-modules.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- environment-modules.spec	23 Sep 2009 15:32:35 -0000	1.20
+++ environment-modules.spec	23 Sep 2009 20:00:48 -0000	1.21
@@ -1,12 +1,13 @@
 Name:           environment-modules
 Version:        3.2.7b
-Release:        1%{?dist}
+Release:        2%{?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:         environment-modules-3.2.7-bindir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  tcl-devel, tclx-devel, libX11-devel
@@ -38,12 +39,15 @@ have access to the module alias.
 
 %prep
 %setup -q -n modules-3.2.7
+%patch0 -p1 -b .bindir
 
 
 %build
-%configure --disable-versioning --prefix=%{_datadir} \
+%configure --disable-versioning \
+           --prefix=%{_datadir} \
            --exec-prefix=%{_datadir}/Modules \
            --with-module-path=%{_sysconfdir}/modulefiles
+
 #           --with-debug=42 --with-log-facility-debug=stderr
 make %{?_smp_mflags}
 
@@ -73,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 23 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-2
+- Add patch to fix modulecmd path in init files
+
 * Wed Sep 23 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-1
 - Update to 3.2.7b
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	23 Sep 2009 15:32:35 -0000	1.2
+++ import.log	23 Sep 2009 20:00:48 -0000	1.3
@@ -1,2 +1,3 @@
 environment-modules-3_2_7-1_fc12:F-11:environment-modules-3.2.7-1.fc12.src.rpm:1253552344
 environment-modules-3_2_7b-1_fc12:F-11:environment-modules-3.2.7b-1.fc12.src.rpm:1253719416
+environment-modules-3_2_7b-2_fc12:F-11:environment-modules-3.2.7b-2.fc12.src.rpm:1253735985