- added libdir patch (honour CMAKE_INSTALL_LIBDIR)

diff --git a/exodusii-libdir.patch b/exodusii-libdir.patch
new file mode 100644 (file)
index 0000000..1f2a451
--- /dev/null
+++ b/exodusii-libdir.patch
@@ -0,0 +1,44 @@
+--- exodus-f7b697abda26c05a5177c9ecf75c782f0b0f31e6/exodus/cbind/CMakeLists.txt.orig   2015-06-03 18:20:18.000000000 +0200
++++ exodus-f7b697abda26c05a5177c9ecf75c782f0b0f31e6/exodus/cbind/CMakeLists.txt        2020-01-09 18:02:18.991082252 +0100
+@@ -301,9 +301,9 @@
+ 
+ IF(NOT EXODUS_INSTALL_NO_LIBRARIES)
+   INSTALL(TARGETS exodus
+-    RUNTIME DESTINATION lib COMPONENT Runtime
+-    LIBRARY DESTINATION lib COMPONENT Runtime
+-    ARCHIVE DESTINATION lib COMPONENT Development)
++    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development)
+   INSTALL(FILES ${cbind_HEADERS} DESTINATION include COMPONENT Development)
+ ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES)
+ 
+--- exodus-f7b697abda26c05a5177c9ecf75c782f0b0f31e6/exodus/forbind/CMakeLists.txt.orig 2015-06-03 18:20:18.000000000 +0200
++++ exodus-f7b697abda26c05a5177c9ecf75c782f0b0f31e6/exodus/forbind/CMakeLists.txt      2020-01-09 18:02:52.726131927 +0100
+@@ -66,9 +66,9 @@
+ 
+ IF(NOT EXODUS_INSTALL_NO_LIBRARIES)
+   INSTALL(TARGETS exoIIv2for
+-    RUNTIME DESTINATION lib COMPONENT Runtime
+-    LIBRARY DESTINATION lib COMPONENT Runtime
+-    ARCHIVE DESTINATION lib COMPONENT Development)
++    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development)
+   INSTALL(FILES ${forbind_HEADERS} DESTINATION include COMPONENT Development)
+ ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES)
+ 
+--- exodus-f7b697abda26c05a5177c9ecf75c782f0b0f31e6/nemesis/CMakeLists.txt.orig        2015-06-03 18:20:18.000000000 +0200
++++ exodus-f7b697abda26c05a5177c9ecf75c782f0b0f31e6/nemesis/CMakeLists.txt     2020-01-09 18:03:15.613963059 +0100
+@@ -80,8 +80,8 @@
+ TARGET_LINK_LIBRARIES( ne_test nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5HL_LIBRARY} ${HDF5_LIBRARY} ${Z_LIBRARY} ${MATH_LIBRARY})
+  
+ INSTALL(TARGETS nemesis
+-  RUNTIME DESTINATION lib COMPONENT Runtime
+-  LIBRARY DESTINATION lib COMPONENT Runtime
+-  ARCHIVE DESTINATION lib COMPONENT Development)
++  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development)
+ INSTALL(FILES ${HEADERS} DESTINATION include COMPONENT Development)
+ 

diff --git a/exodusii.spec b/exodusii.spec
index 403e93746419bd883e0f70ee74b308c9b0041daf..9bfdf89a8ffe6fed016206a491da1f3cc1d48c07 100644 (file)
--- a/exodusii.spec
+++ b/exodusii.spec
@@ -9,6 +9,7 @@ License:        BSD
 Group:         Libraries
 Source0:       https://github.com/certik/exodus/archive/%{gitref}/%{name}-%{snap}.tar.gz
 # Source0-md5: 959f785e18f57aa999f637d4198e0047
+Patch0:                %{name}-libdir.patch
 # mirror; original project URL, sf.net/p/exodusii returns 403
 URL:           https://github.com/certik/exodus
 BuildRequires: cmake >= 2.6
@@ -69,6 +70,7 @@ Dokumentacja do bibliotek Exodus II.
 
 %prep
 %setup -q -n exodus-%{gitref}
+%patch0 -p1
 
 # expected by nemesis
 %{__mv} exodus exodusii