[packages/cmake] - rel 2; fix imagemagick detection from upstream
arekm
arekm at pld-linux.org
Tue Jun 11 21:59:23 CEST 2013
commit 53357b6b47d1e61e29dfe90363402456687dde10
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Jun 11 21:59:20 2013 +0200
- rel 2; fix imagemagick detection from upstream
cmake-git.patch | 22 ++++++++++++++++++++++
cmake.spec | 4 +++-
2 files changed, 25 insertions(+), 1 deletion(-)
---
diff --git a/cmake.spec b/cmake.spec
index 325eb0b..e37c141 100644
--- 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)
diff --git a/cmake-git.patch b/cmake-git.patch
new file mode 100644
index 0000000..9c919bd
--- /dev/null
+++ b/cmake-git.patch
@@ -0,0 +1,22 @@
+commit 3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a
+Author: Funda Wang <fundawang at 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cmake.git/commitdiff/53357b6b47d1e61e29dfe90363402456687dde10
More information about the pld-cvs-commit
mailing list