diff --git a/cmake-dcmtk.patch b/cmake-dcmtk.patch index 8d95b85..7536a15 100644 --- a/cmake-dcmtk.patch +++ b/cmake-dcmtk.patch @@ -1,6 +1,46 @@ ---- cmake-2.8.5/Modules/FindDCMTK.cmake.dcmtk 2011-07-08 06:21:44.000000000 -0600 -+++ cmake-2.8.5/Modules/FindDCMTK.cmake 2011-07-22 16:55:28.616947321 -0600 -@@ -66,7 +66,8 @@ +diff -ur ../cmake-2.8.5.orig/Modules/FindDCMTK.cmake ./Modules/FindDCMTK.cmake +--- ../cmake-2.8.5.orig/Modules/FindDCMTK.cmake 2011-07-08 17:51:44.000000000 +0530 ++++ ./Modules/FindDCMTK.cmake 2011-07-27 23:48:59.721443481 +0530 +@@ -30,6 +30,10 @@ + # Written for VXL by Amitha Perera. + # Upgraded for GDCM by Mathieu Malaterre. + # Modified for EasyViz by Thomas Sondergaard. ++# ++# Wed Jul 27 2011 Ankur Sinha ++# - Add all dcmtk libs ++# - Add usr/lib to paths + # + + if(NOT DCMTK_FOUND AND NOT DCMTK_DIR) +@@ -44,20 +48,26 @@ + + foreach(lib + dcmdata ++ dcmdsig + dcmimage + dcmimgle + dcmjpeg ++ dcmjpls + dcmnet + dcmpstat + dcmqrdb +- dcmsign + dcmsr + dcmtls ++ dcmwlm + ijg12 + ijg16 + ijg8 ++ libi2d ++ oflog + ofstd) + ++ ++ + find_library(DCMTK_${lib}_LIBRARY + ${lib} + PATHS +@@ -66,7 +76,8 @@ ${DCMTK_DIR}/${lib}/libsrc/Debug ${DCMTK_DIR}/${lib}/Release ${DCMTK_DIR}/${lib}/Debug @@ -10,3 +50,47 @@ mark_as_advanced(DCMTK_${lib}_LIBRARY) +@@ -82,13 +93,16 @@ + set(DCMTK_dcmimage_TEST_HEADER dicoimg.h) + set(DCMTK_dcmimgle_TEST_HEADER dcmimage.h) + set(DCMTK_dcmjpeg_TEST_HEADER djdecode.h) ++set(DCMTK_dcmjpls_TEST_HEADER djcodecd.h) + set(DCMTK_dcmnet_TEST_HEADER assoc.h) + set(DCMTK_dcmpstat_TEST_HEADER dcmpstat.h) + set(DCMTK_dcmqrdb_TEST_HEADER dcmqrdba.h) + set(DCMTK_dcmsign_TEST_HEADER sicert.h) + set(DCMTK_dcmsr_TEST_HEADER dsrtree.h) + set(DCMTK_dcmtls_TEST_HEADER tlslayer.h) ++set(DCMTK_dcmwlm_TEST_HEADER wldsfs.h) + set(DCMTK_ofstd_TEST_HEADER ofstdinc.h) ++set(DCMTK_oflog_TEST_HEADER oflog.h) + + foreach(dir + config +@@ -96,19 +110,24 @@ + dcmimage + dcmimgle + dcmjpeg ++ dcmjpls + dcmnet + dcmpstat + dcmqrdb + dcmsign + dcmsr + dcmtls +- ofstd) ++ dcmwlm ++ ofstd ++ oflog) ++ + find_path(DCMTK_${dir}_INCLUDE_DIR + ${DCMTK_${dir}_TEST_HEADER} + PATHS + ${DCMTK_DIR}/${dir}/include + ${DCMTK_DIR}/${dir} +- ${DCMTK_DIR}/include/${dir}) ++ ${DCMTK_DIR}/include/${dir} ++ /usr/include/dcmtk) + + mark_as_advanced(DCMTK_${dir}_INCLUDE_DIR) + diff --git a/cmake.spec b/cmake.spec index 1fd955d..8ec3622 100644 --- a/cmake.spec +++ b/cmake.spec @@ -8,7 +8,7 @@ Name: cmake Version: 2.8.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -159,6 +159,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Thu Jul 28 2011 Orion Poplawski - 2.8.5-3 +- Updated patch to find dcmtk in Fedora (Bug #720140) + * Fri Jul 22 2011 Orion Poplawski - 2.8.5-2 - Add patch to find dcmtk in Fedora (Bug #720140)