From c24a22507db01f30c9fad9d75baa59178ae5a04f Mon Sep 17 00:00:00 2001
From: Susi Lehtola <jussilehtola@fedoraproject.org>
Date: Jun 13 2016 06:08:25 +0000
Subject: Now it should build.


---

diff --git a/psi4-gitversion.patch b/psi4-gitversion.patch
index 60f07af..27ec34e 100644
--- a/psi4-gitversion.patch
+++ b/psi4-gitversion.patch
@@ -1,6 +1,18 @@
+diff -up psi4-15fc63cdd5647247282a5e3f4c9a402f17fb9c24/CMakeLists.txt.gitversion psi4-15fc63cdd5647247282a5e3f4c9a402f17fb9c24/CMakeLists.txt
+--- psi4-15fc63cdd5647247282a5e3f4c9a402f17fb9c24/CMakeLists.txt.gitversion	2016-05-13 07:56:05.000000000 +0200
++++ psi4-15fc63cdd5647247282a5e3f4c9a402f17fb9c24/CMakeLists.txt	2016-06-13 02:38:23.432282605 +0200
+@@ -335,7 +335,7 @@ endif()
+ 
+ #FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin)
+ INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bin/psi4 DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+-INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bin/psi4-config DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
++#INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bin/psi4-config DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+ 
+ # Install samples directory
+ INSTALL(
 diff -up psi4-15fc63cdd5647247282a5e3f4c9a402f17fb9c24/src/bin/psi4/CMakeLists.txt.gitversion psi4-15fc63cdd5647247282a5e3f4c9a402f17fb9c24/src/bin/psi4/CMakeLists.txt
---- psi4-15fc63cdd5647247282a5e3f4c9a402f17fb9c24/src/bin/psi4/CMakeLists.txt.gitversion	2016-06-03 00:16:11.921376389 +0200
-+++ psi4-15fc63cdd5647247282a5e3f4c9a402f17fb9c24/src/bin/psi4/CMakeLists.txt	2016-06-03 00:23:24.755376807 +0200
+--- psi4-15fc63cdd5647247282a5e3f4c9a402f17fb9c24/src/bin/psi4/CMakeLists.txt.gitversion	2016-05-13 07:56:05.000000000 +0200
++++ psi4-15fc63cdd5647247282a5e3f4c9a402f17fb9c24/src/bin/psi4/CMakeLists.txt	2016-06-13 02:37:28.521282665 +0200
 @@ -1,18 +1,11 @@
  # Run the git version script, and update gitversion.h, if it's changed
 -add_custom_target(update_version
@@ -20,7 +32,7 @@ diff -up psi4-15fc63cdd5647247282a5e3f4c9a402f17fb9c24/src/bin/psi4/CMakeLists.t
  add_dependencies(versioned_code_so mints)
  
  set(headers_list "")
-@@ -67,7 +60,6 @@ list(APPEND
+@@ -66,7 +59,6 @@ list(APPEND
  
  # Executable psi4
  add_executable(psi4 $<TARGET_OBJECTS:psi4_objlib> $<TARGET_OBJECTS:versioned_code>)
diff --git a/psi4-libefp.patch b/psi4-libefp.patch
new file mode 100644
index 0000000..401dc8b
--- /dev/null
+++ b/psi4-libefp.patch
@@ -0,0 +1,10 @@
+diff -up psi4-15fc63cdd5647247282a5e3f4c9a402f17fb9c24/interfaces/libefp/CMakeLists.txt.fedora psi4-15fc63cdd5647247282a5e3f4c9a402f17fb9c24/interfaces/libefp/CMakeLists.txt
+--- psi4-15fc63cdd5647247282a5e3f4c9a402f17fb9c24/interfaces/libefp/CMakeLists.txt.fedora	2016-05-12 22:56:05.000000000 -0700
++++ psi4-15fc63cdd5647247282a5e3f4c9a402f17fb9c24/interfaces/libefp/CMakeLists.txt	2016-06-12 22:45:52.092606469 -0700
+@@ -29,5 +29,5 @@ set_property(TARGET interface_libefp PRO
+ set_property(GLOBAL APPEND PROPERTY INTERFACES interface_libefp)
+ 
+ # Sets install directory for all the headers in the list
+-install_list_FILES("${headers_list}" include/interface_libefp)
++install_list_FILES("${headers_list}" include/psi4/interface_libefp)
+ 
diff --git a/psi4.spec b/psi4.spec
index b0b4492..f129910 100644
--- a/psi4.spec
+++ b/psi4.spec
@@ -9,7 +9,7 @@
 %global dconfigure %(printf %%s '%configure' | sed 's!\./configure!../configure!g')
 
 Name:           psi4
-Epoch:		1
+Epoch:          1
 Version:        1.0
 Release:        0.1.rc.%{shortcommit}git%{?dist}
 Summary:        An ab initio quantum chemistry package
@@ -24,6 +24,8 @@ Patch0:         psi4-systemlibint.patch
 Patch1:         psi4-systemboost.patch
 # Use custom version instead of getting it from git
 Patch2:         psi4-gitversion.patch
+# Fix install location of libefp interface
+Patch3:         psi4-libefp.patch
 
 BuildRequires:  cmake
 BuildRequires:  atlas-devel
@@ -90,6 +92,7 @@ This package contains static libraries and development headers for psi.
 %patch0 -p1 -b .systemlibint
 %patch1 -p1 -b .systemboost
 %patch2 -p1 -b .gitversion
+%patch3 -p1 -b .libefp
 
 # Get rid of bundled boost
 rm -rf boost/
@@ -144,7 +147,7 @@ ctest -L quicktests
 
 %files data
 %doc COPYING LICENSE
-%{_datadir}/psi/
+%{_datadir}/psi4/
 
 %files devel
 %doc COPYING LICENSE