diff --git a/environment-modules-3.2.7-bindir.patch b/environment-modules-3.2.7-bindir.patch new file mode 100644 index 0000000..1efb0ee --- /dev/null +++ b/environment-modules-3.2.7-bindir.patch @@ -0,0 +1,11 @@ +--- 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,@prefix\@,${prefix},g; \ +- s,@bindir\@,${exec_prefix}/bin,g; \ ++ s,@bindir\@,${bindir},g; \ + s,@VERSION\@,@VERSION@,g; \ + s,@BASEPREFIX\@,@BASEPREFIX@,g;" < $< > $@ + diff --git a/environment-modules.spec b/environment-modules.spec index 680df74..7f286de 100644 --- a/environment-modules.spec +++ b/environment-modules.spec @@ -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 - 3.2.7b-2 +- Add patch to fix modulecmd path in init files + * Wed Sep 23 2009 Orion Poplawski - 3.2.7b-1 - Update to 3.2.7b