[cmake] Update to 2.8.6 RC 1 Update dcmtk patch

[Orion Poplawski]

commit d6faab91a768f382116a684ecf7d9e2f6271c725
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Aug 29 16:59:08 2011 -0600

    Update to 2.8.6 RC 1
    Update dcmtk patch

 .gitignore        |    1 +
 cmake-dcmtk.patch |   30 ++++++++++++------------------
 cmake.spec        |   10 +++++++---
 sources           |    2 +-
 4 files changed, 21 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5474951..36b346d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ cmake-2.8.2.tar.gz
 /cmake-2.8.5-rc2.tar.gz
 /cmake-2.8.5-rc3.tar.gz
 /cmake-2.8.5.tar.gz
+/cmake-2.8.6-rc1.tar.gz
diff --git a/cmake-dcmtk.patch b/cmake-dcmtk.patch
index 7536a15..d7f77bf 100644
--- a/cmake-dcmtk.patch
+++ b/cmake-dcmtk.patch
@@ -1,6 +1,6 @@
-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
+diff -up cmake-2.8.6-rc1/Modules/FindDCMTK.cmake.dcmtk cmake-2.8.6-rc1/Modules/FindDCMTK.cmake
+--- cmake-2.8.6-rc1/Modules/FindDCMTK.cmake.dcmtk	2011-08-26 10:51:46.000000000 -0600
++++ cmake-2.8.6-rc1/Modules/FindDCMTK.cmake	2011-08-29 16:58:07.299550799 -0600
 @@ -30,6 +30,10 @@
  # Written for VXL by Amitha Perera.
  # Upgraded for GDCM by Mathieu Malaterre.
@@ -12,7 +12,7 @@ diff -ur ../cmake-2.8.5.orig/Modules/FindDCMTK.cmake ./Modules/FindDCMTK.cmake
  #
  
  if(NOT DCMTK_FOUND AND NOT DCMTK_DIR)
-@@ -44,20 +48,26 @@
+@@ -44,20 +48,26 @@ endif()
  
  foreach(lib
      dcmdata
@@ -40,7 +40,7 @@ diff -ur ../cmake-2.8.5.orig/Modules/FindDCMTK.cmake ./Modules/FindDCMTK.cmake
    find_library(DCMTK_${lib}_LIBRARY
      ${lib}
      PATHS
-@@ -66,7 +76,8 @@
+@@ -66,7 +76,8 @@ foreach(lib
      ${DCMTK_DIR}/${lib}/libsrc/Debug
      ${DCMTK_DIR}/${lib}/Release
      ${DCMTK_DIR}/${lib}/Debug
@@ -50,7 +50,7 @@ diff -ur ../cmake-2.8.5.orig/Modules/FindDCMTK.cmake ./Modules/FindDCMTK.cmake
  
    mark_as_advanced(DCMTK_${lib}_LIBRARY)
  
-@@ -82,13 +93,16 @@
+@@ -82,13 +93,16 @@ set(DCMTK_dcmdata_TEST_HEADER dctypes.h)
  set(DCMTK_dcmimage_TEST_HEADER dicoimg.h)
  set(DCMTK_dcmimgle_TEST_HEADER dcmimage.h)
  set(DCMTK_dcmjpeg_TEST_HEADER djdecode.h)
@@ -67,7 +67,7 @@ diff -ur ../cmake-2.8.5.orig/Modules/FindDCMTK.cmake ./Modules/FindDCMTK.cmake
  
  foreach(dir
      config
-@@ -96,19 +110,24 @@
+@@ -96,16 +110,20 @@ foreach(dir
      dcmimage
      dcmimgle
      dcmjpeg
@@ -78,19 +78,13 @@ diff -ur ../cmake-2.8.5.orig/Modules/FindDCMTK.cmake ./Modules/FindDCMTK.cmake
      dcmsign
      dcmsr
      dcmtls
--    ofstd)
-+    dcmwlm
-+    ofstd
-+    oflog)
-+
++    dcmwlen
++    oflog
+     ofstd)
    find_path(DCMTK_${dir}_INCLUDE_DIR
      ${DCMTK_${dir}_TEST_HEADER}
      PATHS
++    /usr/include/dcmtk
      ${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)
- 
+     ${DCMTK_DIR}/include/${dir}
diff --git a/cmake.spec b/cmake.spec
index 8ec3622..b042ec9 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -4,11 +4,11 @@
 # Set to bcond_with or use --without gui to disable qt4 gui build
 %bcond_without gui
 # Set to RC version if building RC, else %{nil}
-%define rcver %{nil}
+%define rcver -rc1
 
 Name:           cmake
-Version:        2.8.5
-Release:        3%{?dist}
+Version:        2.8.6
+Release:        0.1.rc1%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -159,6 +159,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Mon Aug 29 2011 Orion Poplawski <orion at cora.nwra.com> - 2.8.6-0.1.rc1
+- Update to 2.8.6 RC 1
+- Update dcmtk patch
+
 * Thu Jul 28 2011 Orion Poplawski <orion at cora.nwra.com> - 2.8.5-3
 - Updated patch to find dcmtk in Fedora (Bug #720140)
 
diff --git a/sources b/sources
index 7f281e5..9ed3dfb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3c5d32cec0f4c2dc45f4c2e84f4a20c5  cmake-2.8.5.tar.gz
+82d546a0b8a7d75dc42776bd583622ed  cmake-2.8.6-rc1.tar.gz