Accepting request 286152 from KDE:Unstable:Frameworks

Update to 3.2 rc1

OBS-URL: https://build.opensuse.org/request/show/286152
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=193

cmake.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package cmake
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,25 +17,32 @@
 
 
 Name:           cmake
-Version:        3.1.3
+Version:        3.2.0~rc1
 Release:        0
-%define rversion %{version}
+%define rversion 3.2.0-rc1
 Summary:        Cross-platform, open-source make system
 License:        BSD-3-Clause
 Group:          Development/Tools/Building
 Url:            http://www.cmake.org/
-Source0:        http://www.cmake.org/files/v3.1/%{name}-%{rversion}.tar.gz
+Source0:        http://www.cmake.org/files/v3.2/%{name}-%{rversion}.tar.gz
 Source1:        cmake.macros
 Source2:        opensuse_rules.cmake
 Patch2:         cmake-fix-ruby-test.patch
 # PATCH-FIX-OPENSUSE: bnc#874885 contain the python swig namespace
 Patch3:         cmake-prefix-swig.patch
+# PATCH-FIX-UPSTREAM form.patch -- set the correct include path for the ncurses includes
+Patch4:         form.patch
+# PATCH-FIX-UPSTREAM system-libs.patch -- allow choosing between bundled and system jsoncpp & form libs
+Patch5:         system-libs.patch
 BuildRequires:  curl-devel
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  libexpat-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  zlib-devel
+%if 0%{?suse_version} > 1320
+BuildRequires:  pkgconfig(jsoncpp)
+%endif
 BuildRequires:  pkgconfig(liblzma)
 Requires:       make
 Recommends:     cmake-mans
@@ -52,6 +59,8 @@ CMake is a cross-platform, open-source build system
 %setup -q -n %{name}-%{rversion}
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 export CXXFLAGS="%{optflags}"
@@ -64,6 +73,9 @@ export CFLAGS="$CXXFLAGS"
     --system-libs \
 %if 0%{?suse_version} <= 1110
     --no-system-libarchive \
+%endif
+%if 0%{?suse_version} <= 1320
+    --no-system-jsoncpp \
 %endif
     --parallel=0%{jobs} \
     --verbose \