- rel 2; fix imagemagick detection from upstream

diff --git a/cmake-git.patch b/cmake-git.patch
new file mode 100644 (file)
index 0000000..9c919bd
--- /dev/null
+++ b/cmake-git.patch
@@ -0,0 +1,22 @@
+commit 3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a
+Author: Funda Wang <fundawang@gmail.com>
+Date:   Tue May 28 06:17:49 2013 +0000
+
+    FindImageMagick: Find v6 include dir (#14174)
+    
+    The header files of ImageMagick are now located at
+    <prefix>/include/ImageMagick-6 instead of <prefix>/include/ImageMagick.
+
+diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
+index cd97b38..02a5777 100644
+--- a/Modules/FindImageMagick.cmake
++++ b/Modules/FindImageMagick.cmake
+@@ -81,7 +81,7 @@ function(FIND_IMAGEMAGICK_API component header)
+       ${ImageMagick_INCLUDE_DIRS}
+       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
+     PATH_SUFFIXES
+-      ImageMagick
++      ImageMagick ImageMagick-6
+     DOC "Path to the ImageMagick include dir."
+     )
+   find_library(ImageMagick_${component}_LIBRARY

diff --git a/cmake.spec b/cmake.spec
index 325eb0b197bd0b3ce2e173db379b193cc65e42fc..e37c141c5943dc3e518280da371d3011d95da2db 100644 (file)
--- a/cmake.spec
+++ b/cmake.spec
@@ -13,7 +13,7 @@ Summary:      Cross-platform, open-source make system
 Summary(pl.UTF-8):     Wieloplatformowy system make o otwartych źródłach
 Name:          cmake
 Version:       2.8.11.1
-Release:       1
+Release:       2
 License:       BSD
 Group:         Development/Building
 Source0:       http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
@@ -21,6 +21,7 @@ Source0:      http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
 Patch0:                %{name}-lib64.patch
 Patch1:                %{name}-helpers.patch
 Patch2:                cmake-findruby.patch
+Patch3:                cmake-git.patch
 URL:           http://www.cmake.org/
 %{?with_gui:BuildRequires:     QtGui-devel}
 BuildRequires: libarchive-devel
@@ -94,6 +95,7 @@ Bashowe dopełnianie parametrów dla cmake'a.
 %endif
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 cat > "init.cmake" <<EOF
 SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)