thofmann pushed to collada-dom (f22). "Add patch to fix incorrect cmake paths"

[notifications at fedoraproject.org]

From 92d5d26bac5e5325ab2696962048620a1b51617a Mon Sep 17 00:00:00 2001
From: Till Hofmann <hofmann at kbsg.rwth-aachen.de>
Date: Wed, 13 May 2015 15:55:27 +0200
Subject: Add patch to fix incorrect cmake paths


diff --git a/collada-dom.cmake-rootdir-substitution.patch b/collada-dom.cmake-rootdir-substitution.patch
new file mode 100644
index 0000000..148b03b
--- /dev/null
+++ b/collada-dom.cmake-rootdir-substitution.patch
@@ -0,0 +1,17 @@
+diff --git a/collada_dom-config.cmake.in b/collada_dom-config.cmake.in
+index b907955..7134d4f 100644
+--- a/collada_dom-config.cmake.in
++++ b/collada_dom-config.cmake.in
+@@ -12,10 +12,8 @@
+ # COLLADA_DOM_LIBRARY_DIRS - link directories
+ # COLLADA_DOM_LIBRARIES - libraries to link plugins with
+ # COLLADA_DOM_Boost_VERSION - the boost version collada-dom was compiled with
+-get_filename_component(_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+-get_filename_component(_PREFIX "${_PREFIX}" PATH)
+-get_filename_component(_PREFIX "${_PREFIX}" PATH)
+-get_filename_component(COLLADA_DOM_ROOT_DIR "${_PREFIX}" PATH)
++set(_PREFIX @CMAKE_INSTALL_PREFIX@)
++set(COLLADA_DOM_ROOT_DIR "${_PREFIX}")
+ 
+ if( MSVC )
+   # in order to prevent DLL hell, each of the DLLs have to be suffixed with the major version and msvc prefix
diff --git a/collada-dom.spec b/collada-dom.spec
index 00469a3..bf2feae 100644
--- a/collada-dom.spec
+++ b/collada-dom.spec
@@ -1,6 +1,6 @@
 Name:           collada-dom
 Version:        2.4.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        COLLADA Document Object Model Library
 
 Group:          System Environment/Libraries
@@ -12,6 +12,7 @@ URL:            http://www.collada.org
 Source0:        https://github.com/rdiankov/collada-dom/archive/%{commit}/collada-dom-%{commit}.tar.gz
 
 Patch0:         collada-dom.libsuffix.patch
+Patch1:         collada-dom.cmake-rootdir-substitution.patch
 
 BuildRequires:  cmake, gcc-c++, dos2unix
 BuildRequires:  minizip-devel, zlib-devel, boost-devel, libxml2-devel, pcre-devel
@@ -37,6 +38,7 @@ developing applications that use %{name}.
 %prep
 %setup -q -n %{name}-%{commit}
 %patch0 -p1
+%patch1 -p1
 rm -rf dom/external-libs
 dos2unix README.rst
 dos2unix licenses/dom_license_e.txt
@@ -47,7 +49,7 @@ dos2unix licenses/license_e.txt
 mkdir build
 cd build
 %cmake \
-  -DCMAKE_SKIP_RPATH:BOOL=ON \
+  -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \
   ..
 
 make  %{?_smp_mflags}
@@ -79,6 +81,10 @@ mv $RPM_BUILD_ROOT%{_libdir}/cmake/collada_dom-* $RPM_BUILD_ROOT%{_libdir}/cmake
 
 
 %changelog
+* Wed May 13 2015 Till Hofmann <hofmann at kbsg.rwth-aachen.de> - 2.4.3-6
+- Add patch to fix incorrect cmake paths
+- Use CMAKE_SKIP_INSTALL_RPATH instead of CMAKE_SKIP_RPATH
+
 * Tue Jan 27 2015 Petr Machata <pmachata at redhat.com> - 2.4.3-5
 - Rebuild for boost 1.57.0
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/collada-dom.git/commit/?h=f22&id=92d5d26bac5e5325ab2696962048620a1b51617a