diff --git a/assimp-3.2.0-cmakefix.patch b/assimp-3.2.0-cmakefix.patch index e0016a3..5de7bd0 100644 --- a/assimp-3.2.0-cmakefix.patch +++ b/assimp-3.2.0-cmakefix.patch @@ -1,6 +1,6 @@ diff -up ./assimp-config.cmake.in.cmakefix ./assimp-config.cmake.in --- ./assimp-config.cmake.in.cmakefix 2015-11-03 13:47:37.000000000 -0500 -+++ ./assimp-config.cmake.in 2016-05-21 19:59:03.147251477 -0400 ++++ ./assimp-config.cmake.in 2016-06-02 21:03:02.935403339 -0400 @@ -10,10 +10,7 @@ # ASSIMP_LIBRARY_DIRS - link directories # ASSIMP_LIBRARIES - libraries to link plugins with @@ -13,7 +13,7 @@ diff -up ./assimp-config.cmake.in.cmakefix ./assimp-config.cmake.in if( MSVC ) # in order to prevent DLL hell, each of the DLLs have to be suffixed with the major version and msvc prefix -@@ -43,8 +40,8 @@ if( WIN32 ) +@@ -43,10 +40,9 @@ if( WIN32 ) set( ASSIMP_CXX_FLAGS " -DBOOST_ALL_DYN_LINK -DBOOST_ALL_NO_LIB") endif() set( ASSIMP_LINK_FLAGS "" ) @@ -22,5 +22,21 @@ diff -up ./assimp-config.cmake.in.cmakefix ./assimp-config.cmake.in +set( ASSIMP_LIBRARY_DIRS "@ASSIMP_LIB_INSTALL_DIR@") +set( ASSIMP_INCLUDE_DIRS "@ASSIMP_INCLUDE_INSTALL_DIR@") set( ASSIMP_LIBRARIES assimp${ASSIMP_LIBRARY_SUFFIX}) - set( ASSIMP_LIBRARIES ${ASSIMP_LIBRARIES}@CMAKE_DEBUG_POSTFIX@) +-set( ASSIMP_LIBRARIES ${ASSIMP_LIBRARIES}@CMAKE_DEBUG_POSTFIX@) + # search for the boost version assimp was compiled with + #set(Boost_USE_MULTITHREAD ON) +diff -up ./assimp.pc.in.cmakefix ./assimp.pc.in +--- ./assimp.pc.in.cmakefix 2016-06-02 21:00:36.080078257 -0400 ++++ ./assimp.pc.in 2016-06-02 21:01:29.389769945 -0400 +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=@CMAKE_INSTALL_PREFIX@/@ASSIMP_BIN_INSTALL_DIR@ +-libdir=@CMAKE_INSTALL_PREFIX@/@ASSIMP_LIB_INSTALL_DIR@ +-includedir=@CMAKE_INSTALL_PREFIX@/@ASSIMP_INCLUDE_INSTALL_DIR@/assimp ++exec_prefix=@ASSIMP_BIN_INSTALL_DIR@ ++libdir=@ASSIMP_LIB_INSTALL_DIR@ ++includedir=@ASSIMP_INCLUDE_INSTALL_DIR@/assimp + + Name: @CMAKE_PROJECT_NAME@ + Description: Import various well-known 3D model formats in an uniform manner. diff --git a/assimp.spec b/assimp.spec index 3dca17c..816ade4 100644 --- a/assimp.spec +++ b/assimp.spec @@ -3,7 +3,7 @@ Name: assimp Version: 3.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to import various 3D model formats into applications Group: Development/Libraries @@ -100,6 +100,7 @@ mkdir build pushd build %cmake .. \ -DASSIMP_LIB_INSTALL_DIR=%{_libdir} \ + -DASSIMP_BIN_INSTALL_DIR=%{_bindir} \ -DASSIMP_INCLUDE_INSTALL_DIR=%{_includedir} \ -DIRRXML_LIB_PATH=%{_libdir} \ -DIRRXML_INCLUDE_PATH=%{_includedir}/irrlicht/ \ @@ -158,6 +159,9 @@ rm -rf %{buildroot} %{python3_sitelib}/pyassimp %changelog +* Fri Jun 03 2016 Rich Mattes - 3.2.0-2 +- Fix pkgconfig and cmake files (rhbz#1340656) + * Mon May 09 2016 Rich Mattes - 3.2.0-1 - Update to release 3.2.0 (rhbz#1332434)