update to v2.0.0

3 files changed, 10 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b5f5018c9b25..2d84cae15d84 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = kim-api
 	pkgdesc = Online framework for reliable, reproducible and portable molecular simulations
-	pkgver = 2.0.0_beta.3
-	pkgrel = 2
+	pkgver = 2.0.0
+	pkgrel = 1
 	url = https://openkim.org
 	install = kim-api.install
 	arch = i686
@@ -9,11 +9,9 @@ pkgbase = kim-api
 	license = CDDL
 	makedepends = gcc-libs
 	depends = bash
-	source = https://s3.openkim.org/kim-api/kim-api-v2-2.0.0-beta.3.txz
-	source = Fix-major-version-variable-name-in-CM.patch
+	source = https://s3.openkim.org/kim-api/kim-api-v2-2.0.0.txz
 	source = Fix-Doxygen-command-error.patch
-	sha512sums = 22ec9661a48753676de3a20990ad712feab9c0ca0519e3c45f98d3a5ad49d3f0b33496968ac3cfe9f2c0d5bf52ea6dbd47c0283f61b35222f5fa7d1e1ccf3ed5
-	sha512sums = a525539af26238560e310aa7ad23eec75fd87b1f2f82280ace8d61630c41b7780cabfdfa561d6d235101126e74e9d50ee4b767f992dd37948defa3ec589df318
+	sha512sums = 709f7ba26e9ab2a6b55636989fb891e64fada4123fc20c55b69a5555a21a00105053abd3826e0a317856a0ec07c79369a68b185a204fe145ca8d94c455afa5b4
 	sha512sums = e2771561f05b49b7ed46b265af6a2c81ad8fbde9e6ab9f2632822764de5802ac0e91973e66d5240136ea7e9a8b82befc312dbbb3bccdb84d8875744851fcb146
 
 pkgname = kim-api
diff --git a/Fix-major-version-variable-name-in-CM.patch b/Fix-major-version-variable-name-in-CM.patch
deleted file mode 100644
index 0c72693c4d93..000000000000
--- a/Fix-major-version-variable-name-in-CM.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From cd35405a5f1874f529639f6cf8c115b2560d227e Mon Sep 17 00:00:00 2001
-From: "Ryan S. Elliott" <relliott@umn.edu>
-Date: Tue, 11 Dec 2018 12:55:12 -0600
-Subject: [PATCH 01/43] Fix major version variable name in CM
-
----
- utils/collections-management.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/utils/collections-management.in b/utils/collections-management.in
-index f9a3f0ba..11b617a2 100755
---- a/utils/collections-management.in
-+++ b/utils/collections-management.in
-@@ -35,7 +35,7 @@
- #
- 
- collections_info=@CMAKE_INSTALL_FULL_LIBEXECDIR@/@PROJECT_NAME@/@PROJECT_NAME@-collections-info
--major_version=@PROJECT_MAJOR_VERSION@
-+major_version=@PROJECT_VERSION_MAJOR@
- 
- make_command="make"
- cmake_command="cmake"
--- 
-2.20.1
-
diff --git a/PKGBUILD b/PKGBUILD
index d2a4315c68ee..50e7c76513d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Daniel Schopf <schopf.dan at gmail dot com>
 pkgname=kim-api
-pkgver=2.0.0_beta.3
-pkgrel=2
+pkgver=2.0.0
+pkgrel=1
 pkgdesc="Online framework for reliable, reproducible and portable molecular simulations"
 arch=("i686" "x86_64")
 url="https://openkim.org"
@@ -9,16 +9,13 @@ license=('CDDL')
 depends=(bash)
 makedepends=(gcc-libs)
 install=$pkgname.install
-source=(https://s3.openkim.org/kim-api/kim-api-v2-2.0.0-beta.3.txz
-        Fix-major-version-variable-name-in-CM.patch
+source=(https://s3.openkim.org/kim-api/kim-api-v2-2.0.0.txz
 	Fix-Doxygen-command-error.patch)
-sha512sums=('22ec9661a48753676de3a20990ad712feab9c0ca0519e3c45f98d3a5ad49d3f0b33496968ac3cfe9f2c0d5bf52ea6dbd47c0283f61b35222f5fa7d1e1ccf3ed5'
-            'a525539af26238560e310aa7ad23eec75fd87b1f2f82280ace8d61630c41b7780cabfdfa561d6d235101126e74e9d50ee4b767f992dd37948defa3ec589df318'
+sha512sums=('709f7ba26e9ab2a6b55636989fb891e64fada4123fc20c55b69a5555a21a00105053abd3826e0a317856a0ec07c79369a68b185a204fe145ca8d94c455afa5b4'
             'e2771561f05b49b7ed46b265af6a2c81ad8fbde9e6ab9f2632822764de5802ac0e91973e66d5240136ea7e9a8b82befc312dbbb3bccdb84d8875744851fcb146')
 
 prepare() {
-  cd  "kim-api-v2-2.0.0-beta.3"
-  patch -p1 -i ../Fix-major-version-variable-name-in-CM.patch
+  cd "$pkgname-v2-$pkgver"
   patch -p1 -i ../Fix-Doxygen-command-error.patch
   cd ..
   mkdir -p build
@@ -26,7 +23,7 @@ prepare() {
 
 build() {
   cd build
-  cmake ../kim-api-v2-2.0.0-beta.3 \
+  cmake "../$pkgname-v2-$pkgver" \
   	-DCMAKE_BUILD_TYPE=Release \
 	-DCMAKE_INSTALL_PREFIX="/usr" \
 	-DCMAKE_INSTALL_LIBDIR="lib" \