bump version, use git version control, remove old patch

3 files changed, 18 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 95464c4009bd..5cd503336993 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
-pkgbase = moab
+pkgbase = moab-git
 	pkgdesc = The Mesh-Oriented datABase MOAB is a component for representing and evaluating mesh data
-	pkgver = 5.3.0
+	pkgver = 5.4.1
 	pkgrel = 1
 	url = https://bitbucket.org/fathomteam/moab
 	arch = x86_64
@@ -17,8 +17,8 @@ pkgbase = moab
 	depends = python-numpy
 	depends = blas
 	depends = lapack
-	provides = moab
-	source = https://ftp.mcs.anl.gov/pub/fathom/moab-5.3.0.tar.gz
-	md5sums = 7ae3967f297f7d6fddf38de576e98758
+	provides = moab-git
+	source = moab-git::git+https://bitbucket.org/fathomteam/moab.git
+	md5sums = SKIP
 
-pkgname = moab
+pkgname = moab-git
diff --git a/PKGBUILD b/PKGBUILD
index da69fad3bda3..99f85b57eb51 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Luke Labrie-Cleary <luke dot cleary at copenhagenatomics dot com>
-pkgname=moab
-pkgver=5.3.0
+pkgname=moab-git
+pkgver=5.4.1
 pkgrel=1
 pkgdesc="The Mesh-Oriented datABase MOAB is a component for representing and evaluating mesh data"
 arch=('x86_64')
@@ -24,20 +24,22 @@ makedepends=(
 	patch
 )
 
-provides=("${pkgname%-pkgver}")
-source=('https://ftp.mcs.anl.gov/pub/fathom/moab-5.3.0.tar.gz')
-md5sums=('7ae3967f297f7d6fddf38de576e98758')
-prepare() {
-cd "$pkgname-$pkgver"
-patch --forward --input="../../moab-5.3.0-p.1.patch"
+source=("${pkgname}::git+${url}.git")
+pkgver() {
+  cd $srcdir/${pkgname}
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
+provides=("${pkgname%-pkgver}")
+
+md5sums=('SKIP')
 build() {
 	cd $srcdir
 	mkdir build && cd build
-	cmake ../$pkgname-$pkgver -DENABLE_HDF5=ON \
+	cmake ../$pkgname -DENABLE_HDF5=ON \
 				  -DENABLE_NETCDF=ON \
 				  -DENABLE_FORTRAN=OFF \
 				  -DENABLE_BLASLAPACK=OFF \
+				  -DBUILD_SHARED_LIBS=ON \
 				  -DENABLE_PYMOAB=ON \
 				  -DBUILD_SHARED_LIBS=ON \
 				  -DCMAKE_INSTALL_PREFIX=/opt/MOAB
@@ -47,6 +49,4 @@ build() {
 package() {
 	cd $srcdir/build
 	make DESTDIR="$pkgdir/" install
-	cd pymoab
-	python setup.py install --prefix=$pkgdir/opt/MOAB
-}
+}
\ No newline at end of file
diff --git a/moab-5.3.0-p.1.patch b/moab-5.3.0-p.1.patch
deleted file mode 100644
index 5320588f8a96..000000000000
--- a/moab-5.3.0-p.1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./src/moab-5.3.1/CMakeLists.txt	2021-11-12 07:17:17.000000000 +0100
-+++ ./src/moab-5.3.1-new/CMakeLists.txt	2023-02-24 13:00:09.687251667 +0100
-@@ -640,11 +640,11 @@
-   )
- INSTALL(
-   CODE
--  "file(APPEND  ${CMAKE_INSTALL_FULL_LIBDIR}/moab.make MOAB_LIBDIR=${CMAKE_INSTALL_FULL_LIBDIR}\\n )"
-+  "file(APPEND  ${CMAKE_INSTALL_LIBDIR}/moab.make MOAB_LIBDIR=${CMAKE_INSTALL_FULL_LIBDIR}\\n )"
-   )
- INSTALL(
-   CODE
--  "file(APPEND  ${CMAKE_INSTALL_FULL_LIBDIR}/moab.make MOAB_INCLUDES=-I${CMAKE_INSTALL_FULL_INCLUDEDIR}\\n )"
-+  "file(APPEND  ${CMAKE_INSTALL_LIBDIR}/moab.make MOAB_INCLUDES=-I${CMAKE_INSTALL_FULL_INCLUDEDIR}\\n )"
-   )
- INSTALL(
-   FILES "${PROJECT_BINARY_DIR}/MOABConfig.cmake"