updated to version 2.2.7

4 files changed, 9 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f619534b1a66..2edd9f9fdcce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,13 @@
-# Generated by mksrcinfo v8
-# Fri Mar 30 16:54:55 UTC 2018
 pkgbase = cadabra2-git
 	pkgdesc = A computer algebra system (pre-release version) designed specifically for the solution of problems encountered in field theory.
-	pkgver = r1703.c5394b0e6a
+	pkgver = 2.2.7
 	pkgrel = 1
 	url = http://cadabra.science/
-	install = package.install
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = boost
 	makedepends = cmake
-	makedepends = git
 	depends = boost-libs
 	depends = glibmm
 	depends = gmp
@@ -23,10 +19,8 @@ pkgbase = cadabra2-git
 	depends = python-sympy
 	depends = texlive-core
 	conflicts = cadabra2
-	source = cadabra2-git::git+https://github.com/kpeeters/cadabra2
-	source = package.patch
-	md5sums = SKIP
-	md5sums = d41d8cd98f00b204e9800998ecf8427e
+	source = https://github.com/kpeeters/cadabra2/archive/2.2.7.tar.gz
+	md5sums = 95feb70c09aca94a2149adbe4e754f4f
 
 pkgname = cadabra2-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 4d8460900a7e..c0f32e6cd9e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
-# Maintainer: Tarn Burton <twburton at gmail dot com>
+# Maintainer: Erhad Husovic <xdaemonx@protonmail.ch>
 pkgname='cadabra2-git'
-pkgver=r1703.c5394b0e6a
+pkgver=2.2.7
 pkgrel=1
 pkgdesc="A computer algebra system (pre-release version) designed specifically for the solution of problems encountered in field theory."
 arch=('i686' 'x86_64')
@@ -22,26 +22,12 @@ depends=(
 makedepends=(
   'boost'
   'cmake'
-  'git'
 )
-source=("$pkgname::git+https://github.com/kpeeters/cadabra2" "package.patch")
-md5sums=('SKIP'
-         'f18d2d5c9c70064e422cdbd7954ecd59')
-# install=package.install
-
-
-pkgver() {
-  cd $pkgname
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-# prepare() {
-#   cd "${srcdir}/${pkgname}"
-#   patch -Np1 -i ../package.patch
-# }
+source=("https://github.com/kpeeters/cadabra2/archive/${pkgver}.tar.gz")
+md5sums=('95feb70c09aca94a2149adbe4e754f4f')
 
 build() {
-  cd $pkgname
+  cd "$srcdir/cadabra2-$pkgver"
   mkdir -p build
   cd build
   cmake -DCMAKE_SKIP_RPATH=true -DCMAKE_INSTALL_PREFIX=/usr ..
@@ -49,6 +35,6 @@ build() {
 }
 
 package() {
-  cd "${pkgname}/build"
+  cd "$srcdir/cadabra2-$pkgver/build"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/package.install b/package.install
deleted file mode 100755
index bcc3dee5aab4..000000000000
--- a/package.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  mktexlsr
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/package.patch b/package.patch
deleted file mode 100644
index 7be69f549f25..000000000000
--- a/package.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -aur -bZwB -x .git cadabra2-git.old/frontend/CMakeLists.txt cadabra2-git/frontend/CMakeLists.txt
---- cadabra2-git.old/frontend/CMakeLists.txt	2017-01-29 09:40:31.904324635 -0500
-+++ cadabra2-git/frontend/CMakeLists.txt	2017-01-29 09:40:54.937598647 -0500
-@@ -25,8 +25,8 @@
-   execute_process(COMMAND kpsewhich -var-value=TEXMFLOCAL OUTPUT_VARIABLE INSTALL_LATEX_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
- endif()
- # Get the last path in the LaTeX install dir, if there is more than one separated by a ':'.
--#string(REPLACE ":" ";" INSTALL_LATEX_DIR "${INSTALL_LATEX_DIR}")
--#list(GET INSTALL_LATEX_DIR -1 INSTALL_LATEX_DIR)
-+string(REPLACE ":" ";" INSTALL_LATEX_DIR "${INSTALL_LATEX_DIR}")
-+list(GET INSTALL_LATEX_DIR -1 INSTALL_LATEX_DIR)
- set(INSTALL_LATEX_DIR "${INSTALL_LATEX_DIR}/tex/latex/cadabra2")
- message("-- Installing LaTeX style files in ${INSTALL_LATEX_DIR}")
- install(DIRECTORY DESTINATION ${INSTALL_LATEX_DIR} DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE 
-diff -aur -bZwB -x .git cadabra2-git.old/tests/CMakeLists.txt cadabra2-git/tests/CMakeLists.txt
---- cadabra2-git.old/tests/CMakeLists.txt	2017-01-29 09:40:31.907657960 -0500
-+++ cadabra2-git/tests/CMakeLists.txt	2017-01-29 09:40:54.937598647 -0500
-@@ -37,8 +37,8 @@
- foreach(NBTEST ${NBTESTS})
-   add_custom_command(OUTPUT  ${CDBOUT}/${NBTEST}.cdb
- 	 DEPENDS ${CNBIN}/${NBTEST}.cnb ${DC}
--	 COMMAND cadabra2cadabra
--	 ARGS    ${CNBIN}/${NBTEST}.cnb ${CDBOUT}/${NBTEST}.cdb
-+   COMMAND env
-+   ARGS    LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/client_server ${CMAKE_BINARY_DIR}/client_server/cadabra2cadabra ${CNBIN}/${NBTEST}.cnb ${CDBOUT}/${NBTEST}.cdb
- 	 COMMENT "Creating ${NBTEST} notebook...")
-   add_custom_target("${NBTEST}_test" ALL echo -n DEPENDS ${CDBOUT}/${NBTEST}.cdb)
-   add_test(${NBTEST}  ${CMAKE_SOURCE_DIR}/core/cadabra2 ${CDBOUT}/${NBTEST}.cdb)