- revert

Changed files:
    environment-modules-bindir.patch -> 1.3
    environment-modules.spec -> 1.4

diff --git a/environment-modules-bindir.patch b/environment-modules-bindir.patch
new file mode 100644 (file)
index 0000000..1efb0ee
--- /dev/null
+++ b/environment-modules-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 2e11d9286ed85c11e7e2bfc7defc4344e8a302a1..d7c3f1572304413d60ab7d3c0b79b47c89a22ea9 100644 (file)
--- a/environment-modules.spec
+++ b/environment-modules.spec
@@ -7,6 +7,7 @@ Group:          Applications/System
 Source0:       http://downloads.sourceforge.net/modules/modules-%{version}b.tar.bz2
 # Source0-md5: 3ebba50a1f79e63aa9e2189e9e6c7952
 Source1:       modules.sh
+Patch0:                %{name}-bindir.patch
 URL:           http://modules.sourceforge.net/
 BuildRequires: tcl-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -34,6 +35,7 @@ suite of different applications.
 
 %prep
 %setup -q -n modules-%{version}
+%patch0 -p1
 
 %build
 %configure \