From: Kacper Kornet <draenog@pld-linux.org>
Date: Wed, 16 Feb 2011 19:06:43 +0000 (+0000)
Subject: - up to 2.8.4
X-Git-Tag: auto/th/cmake-2_8_4-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcmake.git;a=commitdiff_plain;h=ed5359adc05048e34f1153d778b69506188866d2;hp=6d0542bfa036d9b575bc4e9185fc52df3f8ef606

- up to 2.8.4
- parse.patch applied upstream

Changed files:
    cmake-parse.patch -> 1.2
    cmake.spec -> 1.56
---

diff --git a/cmake-parse.patch b/cmake-parse.patch
deleted file mode 100644
index 12c7e4a..0000000
--- a/cmake-parse.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 6fe8624b7ff39f8511f4f4d7ebcbc5681932a6a5
-Author: Ben Boeckel <ben.boeckel@kitware.com>
-Date:   Mon Nov 22 14:56:55 2010 -0500
-
-    Fix parsing of cache variables without a type
-    
-    These mainly come from the command line or manual entries in the
-    CMakeCache.txt file. We want to stop at the first '=' because this is
-    what is most likely to have been meant. The variable can be quoted if
-    the '=' is intended.
-    
-    Caveat: What if one wants both '"' and '=' in a variable name?
-
-diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
-index 2aa6236..fe6467a 100644
---- a/Source/cmCacheManager.cxx
-+++ b/Source/cmCacheManager.cxx
-@@ -97,10 +97,10 @@ bool cmCacheManager::ParseEntry(const char* entry,
-                                 std::string& var,
-                                 std::string& value)
- {
--  // input line is:         key:type=value
-+  // input line is:         key=value
-   static cmsys::RegularExpression reg(
--    "^([^:]*)=(.*[^\r\t ]|[\r\t ]*)[\r\t ]*$");
--  // input line is:         "key":type=value
-+    "^([^=]*)=(.*[^\r\t ]|[\r\t ]*)[\r\t ]*$");
-+  // input line is:         "key"=value
-   static cmsys::RegularExpression regQuoted(
-     "^\"([^\"]*)\"=(.*[^\r\t ]|[\r\t ]*)[\r\t ]*$");
-   bool flag = false;
diff --git a/cmake.spec b/cmake.spec
index 39ab314..10b3bc1 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -11,15 +11,14 @@
 Summary:	Cross-platform, open-source make system
 Summary(pl.UTF-8):	Wieloplatformowy system make o otwartych źródłach
 Name:		cmake
-Version:	2.8.3
-Release:	2
+Version:	2.8.4
+Release:	1
 License:	BSD
 Group:		Development/Building
 Source0:	http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
-# Source0-md5:	a76a44b93acf5e3badda9de111385921
+# Source0-md5:	209b7d1d04b2e00986538d74ba764fcf
 Patch0:		%{name}-lib64.patch
 Patch1:		%{name}-tinfo.patch
-Patch2:		%{name}-parse.patch
 URL:		http://www.cmake.org/
 %{?with_gui:BuildRequires:	QtGui-devel}
 BuildRequires:	libarchive-devel
@@ -68,7 +67,6 @@ CMake.
 %patch0 -p1
 %endif
 %patch1 -p0
-%patch2 -p1
 
 cat > "init.cmake" <<EOF
 SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)