- Up to 2.8.3

- Removed python 2.7 patch applied upstream

Changed files:
    cmake.spec -> 1.51
    python-2.7.patch -> 1.2

diff --git a/cmake.spec b/cmake.spec
index 7b70bf598998cf882dc4b090f8ec651f42decd64..bddaf377c4d9e9dbf93203a6c1f760ceec7c7698 100644 (file)
--- a/cmake.spec
+++ b/cmake.spec
@@ -11,16 +11,17 @@
 Summary:       Cross-platform, open-source make system
 Summary(pl.UTF-8):     Wieloplatformowy system make o otwartych źródłach
 Name:          cmake
-Version:       2.8.2
-Release:       2
+Version:       2.8.3
+Release:       1
 License:       BSD
 Group:         Development/Building
 Source0:       http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
-# Source0-md5: 8c967d5264657a798f22ee23976ff0d9
+# Source0-md5: a76a44b93acf5e3badda9de111385921
 Patch0:                %{name}-lib64.patch
 Patch1:                %{name}-tinfo.patch
-Patch2:                python-2.7.patch
 URL:           http://www.cmake.org/
+Requires:      libarchive
+BuildRequires: libarchive-devel
 %{?with_gui:BuildRequires:     QtGui-devel}
 BuildRequires: libstdc++-devel
 BuildRequires: ncurses-devel
@@ -67,7 +68,6 @@ CMake.
 %patch0 -p1
 %endif
 %patch1 -p0
-%patch2 -p1
 
 cat > "init.cmake" <<EOF
 SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)

diff --git a/python-2.7.patch b/python-2.7.patch
deleted file mode 100644 (file)
index afe8052..0000000
--- a/python-2.7.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake-2.8.2/Modules/FindPythonLibs.cmake~  2010-06-28 18:15:57.000000000 +0300
-+++ cmake-2.8.2/Modules/FindPythonLibs.cmake   2010-07-17 22:49:14.936169397 +0300
-@@ -27,7 +27,7 @@
- # Search for the python framework on Apple.
- CMAKE_FIND_FRAMEWORKS(Python)
- 
--FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
-+FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
-   STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
-   IF(WIN32)
-     FIND_LIBRARY(PYTHON_DEBUG_LIBRARY