From a8b61fb8fe0d63ec704448147cef03c75eff11c3 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Oct 04 2010 15:06:58 +0000
Subject: - Update to 3.2.8

- Drop mandir patch, use --with-def-man-path

---

diff --git a/.gitignore b/.gitignore
index a5c597e..2c31459 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-modules-3.2.7b.tar.bz2
+modules-3.2.8.tar.bz2
diff --git a/environment-modules-3.2.7-manpath.patch b/environment-modules-3.2.7-manpath.patch
deleted file mode 100644
index 89c76eb..0000000
--- a/environment-modules-3.2.7-manpath.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up modules-3.2.7/cmdPath.c.manpath modules-3.2.7/cmdPath.c
---- modules-3.2.7/cmdPath.c.manpath	2009-07-30 12:03:20.000000000 -0600
-+++ modules-3.2.7/cmdPath.c	2010-01-07 15:32:49.175198225 -0700
-@@ -58,6 +58,10 @@ static void *UseId[] = { &UseId, Id };
- #define	PATH_BUFLEN	1024
- #endif
- 
-+#ifndef MANPATH
-+#define MANPATH "/usr/share/man"
-+#endif
-+
- /** ************************************************************************ **/
- /**				      MACROS				     **/
- /** ************************************************************************ **/
-@@ -215,7 +219,7 @@ int	cmdSetPath(	ClientData	 client_data,
-     _TCLCHK(interp)
- 
-     if( oldpath == NULL)
--	oldpath = !strcmp( argv[arg1], "MANPATH") ? "/usr/man" : "";
-+	oldpath = !strcmp( argv[arg1], "MANPATH") ? MANPATH : "";
- 
-     /**
-      **  Split the new path into its components directories so each
diff --git a/environment-modules.spec b/environment-modules.spec
index e32bf16..555813b 100644
--- a/environment-modules.spec
+++ b/environment-modules.spec
@@ -1,6 +1,6 @@
 Name:           environment-modules
-Version:        3.2.7b
-Release:        7%{?dist}
+Version:        3.2.8
+Release:        1%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
 Group:          System Environment/Base
@@ -10,7 +10,6 @@ Source0:        http://downloads.sourceforge.net/modules/modules-%{version}.tar.
 Source1:        modules.sh
 Source2:        createmodule.sh
 Patch0:         environment-modules-3.2.7-bindir.patch
-Patch1:         environment-modules-3.2.7-manpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  tcl-devel, tclx-devel, libX11-devel
@@ -44,18 +43,16 @@ have access to the module alias.
 
 
 %prep
-%setup -q -n modules-3.2.7
+%setup -q -n modules-%{version}
 %patch0 -p1 -b .bindir
-%patch1 -p1 -b .manpath
 
 
 %build
-export CPPFLAGS=-DMANPATH=\'\"`manpath`\"\'
 %configure --disable-versioning \
            --prefix=%{_datadir} \
            --exec-prefix=%{_datadir}/Modules \
+           --with-def-man-path=$(manpath) \
            --with-module-path=%{_sysconfdir}/modulefiles
-
 #           --with-debug=42 --with-log-facility-debug=stderr
 make %{?_smp_mflags}
 
@@ -86,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 4 2010 Orion Poplawski <orion@cora.nwra.com> - 3.2.8-1
+- Update to 3.2.8
+- Drop mandir patch, use --with-def-man-path
+
 * Thu Jan 7 2010 Orion Poplawski <orion@cora.nwra.com> - 3.2.7b-7
 - Add patch to set a sane default MANPATH
 - Add createmodule.sh utility script for creating modulefiles
diff --git a/sources b/sources
index 9bd7790..87cfa36 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3ebba50a1f79e63aa9e2189e9e6c7952  modules-3.2.7b.tar.bz2
+c8263989a56c650ef65f29ecfffd22fd  modules-3.2.8.tar.bz2