- added lib patch (respect LIB_SUFFIX)

diff --git a/teem-lib.patch b/teem-lib.patch
new file mode 100644 (file)
index 0000000..12482f1
--- /dev/null
+++ b/teem-lib.patch
@@ -0,0 +1,37 @@
+--- teem-1.11.0-src/CMakeLists.txt.orig        2012-12-20 15:12:22.000000000 +0100
++++ teem-1.11.0-src/CMakeLists.txt     2012-12-29 07:52:59.594222717 +0100
+@@ -415,8 +415,8 @@
+ 
+ INSTALL(TARGETS teem
+   RUNTIME DESTINATION bin
+-  LIBRARY DESTINATION lib${EXTRA_INSTALL_PATH}
+-  ARCHIVE DESTINATION lib${EXTRA_INSTALL_PATH}
++  LIBRARY DESTINATION lib${LIB_SUFFIX}${EXTRA_INSTALL_PATH}
++  ARCHIVE DESTINATION lib${LIB_SUFFIX}${EXTRA_INSTALL_PATH}
+   ) 
+ 
+ # Stand-alone programs to process hex encoding of data
+@@ -492,12 +492,12 @@
+   SET(Teem_CV_CONFIG_TO_ROOT "..")
+ ENDIF(Teem_USE_LIB_INSTALL_SUBDIR)
+ 
+-SET(Teem_CV_LIBRARY_DEPENDS_FILE "\${Teem_ROOT_DIR}/lib${EXTRA_INSTALL_PATH}/TeemLibraryDepends.cmake")
++SET(Teem_CV_LIBRARY_DEPENDS_FILE "\${Teem_ROOT_DIR}/lib${LIB_SUFFIX}/cmake/teem/TeemLibraryDepends.cmake")
+ SET(Teem_CV_EXECUTABLE_DIRS "\${Teem_ROOT_DIR}/bin")
+-SET(Teem_CV_LIBRARY_DIRS "\${Teem_ROOT_DIR}/lib${EXTRA_INSTALL_PATH}")
+-SET(Teem_CV_USE_FILE "\${Teem_ROOT_DIR}/lib${EXTRA_INSTALL_PATH}/TeemUse.cmake")
++SET(Teem_CV_LIBRARY_DIRS "\${Teem_ROOT_DIR}/lib${LIB_SUFFIX}${EXTRA_INSTALL_PATH}")
++SET(Teem_CV_USE_FILE "\${Teem_ROOT_DIR}/lib${LIB_SUFFIX}/cmake/teem/TeemUse.cmake")
+ SET(Teem_CV_INCLUDE_DIRS "\${Teem_ROOT_DIR}/include")
+-SET(Teem_CV_BUILD_SETTINGS_FILE "\${Teem_ROOT_DIR}/lib${EXTRA_INSTALL_PATH}/TeemBuildSettings.cmake")
++SET(Teem_CV_BUILD_SETTINGS_FILE "\${Teem_ROOT_DIR}/lib${LIB_SUFFIX}/cmake/teem/TeemBuildSettings.cmake")
+ SET(Teem_CV_BUILT_LIBRARIES teem) # The libraries built by teem.  Currently we only build the mega library.
+ 
+ CONFIGURE_FILE("${Teem_SOURCE_DIR}/CMake/TeemConfig.cmake.in"
+@@ -513,5 +513,5 @@
+   "${Teem_SOURCE_DIR}/CMake/TeemUse.cmake"
+   "${Teem_BINARY_DIR}/TeemBuildSettings.cmake"
+   "${Teem_BINARY_DIR}/TeemLibraryDepends.cmake"
+-  DESTINATION lib${EXTRA_INSTALL_PATH}
++  DESTINATION lib${LIB_SUFFIX}/cmake/teem
+   )

diff --git a/teem.spec b/teem.spec
index 3aadeb68b164c3f0365530f2e6946ff3eea4096c..f2836ad5390072191bf7ac7ac406891e7f4e2c7a 100644 (file)
--- a/teem.spec
+++ b/teem.spec
@@ -8,6 +8,7 @@ License:        SLUL v1 (LGPL v2.1+ with linking exception)
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/teem/%{name}-%{version}-src.tar.gz
 # Source0-md5: 6b9737e8b7640e18eaf281e830fe59d1
+Patch0:                %{name}-lib.patch
 URL:           http://teem.sourceforge.net/
 BuildRequires: bzip2-devel
 BuildRequires: cmake >= 2.4
@@ -38,6 +39,7 @@ Pliki nagłówkowe biblioteki Teem.
 
 %prep
 %setup -q -n %{name}-%{version}-src
+%patch0 -p1
 
 %build
 %cmake . \
@@ -46,13 +48,10 @@ Pliki nagłówkowe biblioteki Teem.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}/cmake/teem
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-mv $RPM_BUILD_ROOT%{_libdir}/*.cmake $RPM_BUILD_ROOT%{_libdir}/cmake/teem
-
 %clean
 rm -rf $RPM_BUILD_ROOT