Backport a fix for installing models and fix CMake build issue

4 files changed, 54 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d766fb81f68a..b5f5018c9b25 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 = 1
+	pkgrel = 2
 	url = https://openkim.org
 	install = kim-api.install
 	arch = i686
@@ -10,7 +10,11 @@ pkgbase = kim-api
 	makedepends = gcc-libs
 	depends = bash
 	source = https://s3.openkim.org/kim-api/kim-api-v2-2.0.0-beta.3.txz
-	md5sums = 67c103a00e84865848d004837262c76e
+	source = Fix-major-version-variable-name-in-CM.patch
+	source = Fix-Doxygen-command-error.patch
+	sha512sums = 22ec9661a48753676de3a20990ad712feab9c0ca0519e3c45f98d3a5ad49d3f0b33496968ac3cfe9f2c0d5bf52ea6dbd47c0283f61b35222f5fa7d1e1ccf3ed5
+	sha512sums = a525539af26238560e310aa7ad23eec75fd87b1f2f82280ace8d61630c41b7780cabfdfa561d6d235101126e74e9d50ee4b767f992dd37948defa3ec589df318
+	sha512sums = e2771561f05b49b7ed46b265af6a2c81ad8fbde9e6ab9f2632822764de5802ac0e91973e66d5240136ea7e9a8b82befc312dbbb3bccdb84d8875744851fcb146
 
 pkgname = kim-api
 
diff --git a/Fix-Doxygen-command-error.patch b/Fix-Doxygen-command-error.patch
new file mode 100644
index 000000000000..044bf23c2ea0
--- /dev/null
+++ b/Fix-Doxygen-command-error.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e328925d..5da8fcda 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -43,6 +43,7 @@ include(DefaultCompilerStandards)
+ 
+ # Define options
+ #
++set(DOXYGEN_LATEX_MAKEINDEX_CMD makeindex)
+ set(PROJECT_PREFIX "kim-api" CACHE STRING "Project prefix string")
+ mark_as_advanced(KIM_API_PROJECT_PREFIX)
+ #
diff --git a/Fix-major-version-variable-name-in-CM.patch b/Fix-major-version-variable-name-in-CM.patch
new file mode 100644
index 000000000000..0c72693c4d93
--- /dev/null
+++ b/Fix-major-version-variable-name-in-CM.patch
@@ -0,0 +1,25 @@
+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 8b839b374af5..d2a4315c68ee 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=1
+pkgrel=2
 pkgdesc="Online framework for reliable, reproducible and portable molecular simulations"
 arch=("i686" "x86_64")
 url="https://openkim.org"
@@ -9,10 +9,18 @@ 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")
-md5sums=('67c103a00e84865848d004837262c76e')
+source=(https://s3.openkim.org/kim-api/kim-api-v2-2.0.0-beta.3.txz
+        Fix-major-version-variable-name-in-CM.patch
+	Fix-Doxygen-command-error.patch)
+sha512sums=('22ec9661a48753676de3a20990ad712feab9c0ca0519e3c45f98d3a5ad49d3f0b33496968ac3cfe9f2c0d5bf52ea6dbd47c0283f61b35222f5fa7d1e1ccf3ed5'
+            'a525539af26238560e310aa7ad23eec75fd87b1f2f82280ace8d61630c41b7780cabfdfa561d6d235101126e74e9d50ee4b767f992dd37948defa3ec589df318'
+            'e2771561f05b49b7ed46b265af6a2c81ad8fbde9e6ab9f2632822764de5802ac0e91973e66d5240136ea7e9a8b82befc312dbbb3bccdb84d8875744851fcb146')
 
 prepare() {
+  cd  "kim-api-v2-2.0.0-beta.3"
+  patch -p1 -i ../Fix-major-version-variable-name-in-CM.patch
+  patch -p1 -i ../Fix-Doxygen-command-error.patch
+  cd ..
   mkdir -p build
 }