version bump to 4.3.1

4 files changed, 9 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cd0721e7dc62..da5904463f52 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = env-modules
 	pkgdesc = Provides for an easy dynamic modification of a user's environment via modulefile.
-	pkgver = 4.3.0
+	pkgver = 4.3.1
 	pkgrel = 2
 	url = https://sourceforge.net/projects/modules/
 	install = env-modules.install
@@ -12,12 +12,10 @@ pkgbase = env-modules
 	conflicts = env-modules
 	replaces = env-modules
 	backup = etc/modules/init/modulerc
-	source = https://sourceforge.net/projects/modules/files/Modules/modules-4.3.0/modules-4.3.0.tar.gz
+	source = https://sourceforge.net/projects/modules/files/Modules/modules-4.3.1/modules-4.3.1.tar.gz
 	source = moduleshome.patch
-	source = lib-makefile.in.patch
-	md5sums = bc45aff23db73a38f635d3311c61ce16
-	md5sums = 7e6bf66733845eb3705a0a19c029eed6
-	md5sums = 6be36c0076bde45c0cc856b742ff701b
+	md5sums = 70b5a0f6bf8771a26435661794e78b12
+	md5sums = 3a3b6ba0ac0766be9ba601223baaf107
 
 pkgname = env-modules
 
diff --git a/PKGBUILD b/PKGBUILD
index 51b5df35484f..ecbcf0ef8883 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: snafu
 pkgname=(env-modules)
-pkgver=4.3.0
+pkgver=4.3.1
 pkgrel=2
 epoch=
 pkgdesc="Provides for an easy dynamic modification of a user's environment via modulefile."
@@ -18,12 +18,11 @@ replaces=(env-modules)
 options=()
 install=env-modules.install
 changelog=
-source=("https://sourceforge.net/projects/modules/files/Modules/modules-$pkgver/modules-$pkgver.tar.gz" moduleshome.patch lib-makefile.in.patch)
+source=("https://sourceforge.net/projects/modules/files/Modules/modules-$pkgver/modules-$pkgver.tar.gz" moduleshome.patch)
 noextract=()
 validpgpkeys=()
-md5sums=('bc45aff23db73a38f635d3311c61ce16'
-         '7e6bf66733845eb3705a0a19c029eed6'
-         '6be36c0076bde45c0cc856b742ff701b')
+md5sums=('70b5a0f6bf8771a26435661794e78b12'
+         '3a3b6ba0ac0766be9ba601223baaf107')
 
 # Install locations:
 install_prefix=/usr
@@ -38,7 +37,6 @@ prepare() {
     cd "modules-$pkgver"
 
     patch -p1 < ../moduleshome.patch
-    patch -p1 < ../lib-makefile.in.patch
 }
 
 build() {
diff --git a/lib-makefile.in.patch b/lib-makefile.in.patch
deleted file mode 100644
index a0ed74b9b5b0..000000000000
--- a/lib-makefile.in.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git  a/lib/Makefile.in b/lib/Makefile.in
-index 843e178..8e77ec7 100644
---- a/lib/Makefile.in
-+++ b/lib/Makefile.in
-@@ -4,7 +4,7 @@
- CFLAGS_WARNING=@CFLAGS_WARNING@
- 
- CC=@TCL_CC@
--CFLAGS=@CFLAGS@@TCL_INCLUDE_SPEC@
-+CFLAGS=@CFLAGS@ @TCL_INCLUDE_SPEC@
- # apply specific flags if code coverage asked
- ifeq ($(COVERAGE),y)
- CFLAGS += -coverage -O0
diff --git a/moduleshome.patch b/moduleshome.patch
index 6b6c9cbe55c5..201e67e1a0dc 100644
--- a/moduleshome.patch
+++ b/moduleshome.patch
@@ -2,7 +2,7 @@ diff --git a/modulecmd.tcl.in b/modulecmd.tcl.in
 index 843e178..8e77ec7 100644
 --- a/modulecmd.tcl.in
 +++ b/modulecmd.tcl.in
-@@ -9066,7 +9066,7 @@ proc cmdModuleAutoinit {} {
+@@ -9174,7 +9174,7 @@ proc cmdModuleAutoinit {} {
     pushMode load
  
     # default MODULESHOME