+++ /dev/null
-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
---- a/Docs/bash-completion/CMakeLists.txt 2012-08-09 20:15:18.000000000 +0200
-+++ b/Docs/bash-completion/CMakeLists.txt 2012-08-15 13:46:38.124245369 +0200
+--- cmake-2.8.12/Docs/bash-completion/CMakeLists.txt.orig 2013-10-07 17:31:00.000000000 +0200
++++ cmake-2.8.12/Docs/bash-completion/CMakeLists.txt 2013-10-20 17:12:23.756481217 +0200
@@ -5,4 +5,4 @@
# add symlinks to the files in appropriate places
# /etc/bash_completion.d/
# DATADIR/completions (may be /usr/share/<package>/completions
--install(FILES cmake cpack ctest DESTINATION ${REL_CMAKE_DATA_DIR}/completions)
-+install(FILES cmake cpack ctest DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/bash_completion.d)
---- a/Docs/CMakeLists.txt 2012-08-09 20:15:18.000000000 +0200
-+++ b/Docs/CMakeLists.txt 2012-08-16 13:29:07.401201870 +0200
-@@ -1,4 +1,4 @@
- string(REGEX REPLACE "^/(.*)" "\\1" REL_CMAKE_DATA_DIR "${CMAKE_DATA_DIR}")
- install(FILES cmake-help.vim cmake-indent.vim cmake-syntax.vim DESTINATION ${REL_CMAKE_DATA_DIR}/editors/vim)
--install(FILES cmake-mode.el DESTINATION ${REL_CMAKE_DATA_DIR}/editors/emacs)
+-install(FILES cmake cpack ctest DESTINATION ${CMAKE_DATA_DIR}/completions)
++install(FILES cmake cpack ctest DESTINATION ${CMAKE_INSTALL_DATADIR}/bash-completion/completions)
+--- cmake-2.8.12/Docs/CMakeLists.txt.orig 2013-10-20 17:07:32.733160096 +0200
++++ cmake-2.8.12/Docs/CMakeLists.txt 2013-10-20 17:13:38.969811394 +0200
+@@ -1,3 +1,3 @@
+ install(FILES cmake-help.vim cmake-indent.vim cmake-syntax.vim DESTINATION ${CMAKE_DATA_DIR}/editors/vim)
+-install(FILES cmake-mode.el DESTINATION ${CMAKE_DATA_DIR}/editors/emacs)
+install(FILES cmake-mode.el DESTINATION ${CMAKE_INSTALL_DATADIR}/emacs/site-lisp)
- ADD_SUBDIRECTORY (bash-completion)
+ add_subdirectory (bash-completion)
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.2
+Version: 2.8.12
Release: 1
License: BSD
Group: Development/Building
Source0: http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
-# Source0-md5: 6f5d7b8e7534a5d9e1a7664ba63cf882
+# Source0-md5: 105bc6d21cc2e9b6aff901e43c53afea
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
Summary(pl.UTF-8): Bashowe dopełnianie parametrów dla cmake'a
Group: Applications/Shells
Requires: %{name} = %{version}-%{release}
+Requires: bash-completion >= 2.0
%description -n bash-completion-%{name}
bash-completion for cmake.
%endif
%patch1 -p1
%patch2 -p1
-%patch3 -p1
cat > "init.cmake" <<EOF
SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)
%files -n bash-completion-%{name}
%defattr(644,root,root,755)
-/etc/bash_completion.d/cmake
-/etc/bash_completion.d/cpack
-/etc/bash_completion.d/ctest
+%{_datadir}/bash-completion/completions/cmake
+%{_datadir}/bash-completion/completions/cpack
+%{_datadir}/bash-completion/completions/ctest