Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at 2013-06-24 09:19:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmake (Old) and /work/SRC/openSUSE:Factory/.cmake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmake" Changes: -------- --- /work/SRC/openSUSE:Factory/cmake/cmake.changes 2013-06-11 09:26:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake.changes 2013-06-24 09:19:37.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Jun 20 19:17:35 UTC 2013 - tittiatc...@gmail.com + +- Added upstream patch cmake-fix-ImageMagick6.patch + + FindImageMagick: Find v6 include dir (#14174) + + The header files of ImageMagick are now located at + <prefix>/include/ImageMagick-6 instead of + <prefix>/include/ImageMagick. + +------------------------------------------------------------------- New: ---- cmake-fix-ImageMagick6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.ljD5i0/_old 2013-06-24 09:19:38.000000000 +0200 +++ /var/tmp/diff_new_pack.ljD5i0/_new 2013-06-24 09:19:38.000000000 +0200 @@ -23,6 +23,7 @@ Source0: http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz Patch1: cmake-disable-builtin-chrpath.diff Patch2: cmake-fix-ruby-test.patch +Patch3: cmake-fix-ImageMagick6.patch Summary: Cross-platform, open-source make system License: BSD-3-Clause Group: Development/Tools/Building @@ -51,6 +52,7 @@ %setup -q %patch1 %patch2 +%patch3 -p1 %build export CXXFLAGS="$RPM_OPT_FLAGS" ++++++ cmake-fix-ImageMagick6.patch ++++++ From: Funda Wang <fundaw...@gmail.com> Date: Tue, 28 May 2013 06:17:49 +0000 (+0000) Subject: FindImageMagick: Find v6 include dir (#14174) X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a 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 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
