yaehmop: Fix hard-coded data file path

2 files changed, 53 insertions, 4 deletions

diff --git a/yaehmop/0003-Fix-hard-coded-data-path.patch b/yaehmop/0003-Fix-hard-coded-data-path.patch
new file mode 100644
index 0000000..b27a280
--- /dev/null
+++ b/yaehmop/0003-Fix-hard-coded-data-path.patch
@@ -0,0 +1,39 @@
+From 255b0f81a99f59b66d249191d5eb4c4889717c4f Mon Sep 17 00:00:00 2001
+From: LAN-TW <lantw44@gmail.com>
+Date: Sat, 2 Nov 2013 15:34:35 +0800
+Subject: [PATCH] Fix hard-coded data path
+
+---
+ tightbind/makefile.linux | 2 +-
+ viewkel/Makefile         | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tightbind/makefile.linux b/tightbind/makefile.linux
+index f9c0e5c..abe1569 100755
+--- a/tightbind/makefile.linux
++++ b/tightbind/makefile.linux
+@@ -8,7 +8,7 @@
+ # to change where the program looks for the extended hueckel parameters
+ #   change the following:
+ # This is the one for isolobal
+-PARM_FILE_LOC = \"/usr/local/lib/eht_parms.dat\"
++PARM_FILE_LOC = \"/usr/share/yaehmop/tightbind/eht_parms.dat\"
+ 
+ # to use floats instead of doubles, insert -DUSE_FLOATS here.
+ #  to perform real symmetry analysis (with principle axis location), use
+diff --git a/viewkel/Makefile b/viewkel/Makefile
+index 3dea2b5..c9f18e9 100644
+--- a/viewkel/Makefile
++++ b/viewkel/Makefile
+@@ -15,7 +15,7 @@ UTILSOBJS=genutil.o mem_debug.o
+ #PARM_FILE_LOC = \"/usr/local/src/yaehmop/viewkel/atomic_parms.dat\"
+ #PARM_FILE_LOC = \"/home/landrum/yaehmop/viewkel/atomic_parms.dat\"
+ #PARM_FILE_LOC = \"/usr/local/lib/atomic_parms.dat\"
+-PARM_FILE_LOC = \"/home/glandrum/yaehmop/viewkel/new_atomic_parms.dat\"
++PARM_FILE_LOC = \"/usr/share/yaehmop/viewkel/new_atomic_parms.dat\"
+ 
+ # these are things you can turn on or off to make yourself happy.
+ OPT_FEATURES = -DTEK_GRAPHICS -DX_GRAPHICS -DINTERACTIVE_USE \
+-- 
+1.8.4.2
+
diff --git a/yaehmop/PKGBUILD b/yaehmop/PKGBUILD
index 5f92c2c..9ce2eb5 100644
--- a/yaehmop/PKGBUILD
+++ b/yaehmop/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=yaehmop
 pkgver=3.1.0b2
-pkgrel=2
+pkgrel=3
 pkgdesc="Yet Another extended Huckel Molecular Orbital Package (YAeHMOP)"
 arch=('x86_64' 'i686')
 url="http://yaehmop.sourceforge.net/"
@@ -14,13 +14,15 @@ source=('http://downloads.sourceforge.net/project/yaehmop/yaehmop-beta/3.1.0b2/b
 		'http://downloads.sourceforge.net/project/yaehmop/yaehmop-beta/3.1.0b2/viewkel.3.1.0b.tgz'
 		'http://downloads.sourceforge.net/project/yaehmop/yaehmop-beta/3.1.0b2/dense_eval.3.1.0b.tgz'
 		'0001-Fix-build-problems.patch'
-		'0002-Fix-implicit-declaration.patch')
+		'0002-Fix-implicit-declaration.patch'
+		'0003-Fix-hard-coded-data-path.patch')
 
 md5sums=('5a717a1f9c5dbe6cf36de15cb3c5b6ef'
 		'd629bface0f610f7a4a1b3d0305872ca'
 		'aec78fae520950777b7738cf42626d99'
 		'4290dcf6a1ddb040c38dbb54d8698c5b'
-		'89ecc02032067fc72a576943b9a413e7')
+		'89ecc02032067fc72a576943b9a413e7'
+		'f0804353cfdb4ea56c8c0c92bec0a40a')
 
 build() {
 	cd "${srcdir}/${pkgname}"
@@ -35,6 +37,7 @@ build() {
 	rm -f tightbind/utils/genutil.o
 	patch -p1 < ../../0001-Fix-build-problems.patch
 	patch -p1 < ../../0002-Fix-implicit-declaration.patch
+	patch -p1 < ../../0003-Fix-hard-coded-data-path.patch
 	cd tightbind
 	make -f makefile.linux install
 	cd ../viewkel
@@ -49,8 +52,15 @@ build() {
 }
 
 package() {
+	mkdir -p "${pkgdir}/usr/share/${pkgname}/tightbind"
 	mkdir -p "${pkgdir}/usr/share/${pkgname}/viewkel"
 	cp -rp "${srcdir}/${pkgname}/bin" "${pkgdir}/usr/"
-	install -m 644 "${srcdir}/${pkgname}/viewkel/new_atomic_parms.dat" \
+	install -m 644 \
+		"${srcdir}/${pkgname}/tightbind/eht_parms.dat" \
+		"${srcdir}/${pkgname}/tightbind/muller_parms.dat" \
+		"${pkgdir}/usr/share/${pkgname}/tightbind"
+	install -m 644 \
+		"${srcdir}/${pkgname}/viewkel/new_atomic_parms.dat" \
+		"${srcdir}/${pkgname}/viewkel/atomic_parms.dat" \
 		"${pkgdir}/usr/share/${pkgname}/viewkel"
 }