From 672d6ddeda0ddec04cae8f391b1b1c7846a722ce493028d120e305eee9a6af98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Wed, 29 Oct 2014 07:53:39 +0000
Subject: [PATCH 1/6] Accepting request 258717 from KDE:Unstable:Frameworks

Update to 3.1.0~rc1

OBS-URL: https://build.opensuse.org/request/show/258717
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=180
---
 cmake-3.0.2.tar.gz                  |  3 --
 cmake-3.1.0-rc1.tar.gz              |  3 ++
 cmake-fix-module-loading-test.patch |  2 +-
 cmake-fix-ruby-test.patch           |  2 +-
 cmake-gui.changes                   | 45 ++++++++++++++++++++++++++++
 cmake-gui.spec                      |  8 +++--
 cmake-ppc64le-jni.patch             | 28 ------------------
 cmake.changes                       | 46 +++++++++++++++++++++++++++++
 cmake.spec                          | 11 ++++---
 9 files changed, 106 insertions(+), 42 deletions(-)
 delete mode 100644 cmake-3.0.2.tar.gz
 create mode 100644 cmake-3.1.0-rc1.tar.gz
 delete mode 100644 cmake-ppc64le-jni.patch

diff --git a/cmake-3.0.2.tar.gz b/cmake-3.0.2.tar.gz
deleted file mode 100644
index 369c829..0000000
--- a/cmake-3.0.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b4ea61eadbbd9bec0ccb383c29d1f4496eacc121ef7acf37c7a24777805693e
-size 5490501
diff --git a/cmake-3.1.0-rc1.tar.gz b/cmake-3.1.0-rc1.tar.gz
new file mode 100644
index 0000000..6449540
--- /dev/null
+++ b/cmake-3.1.0-rc1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c71775595659e203f77f440fa6db5abdd3c1cbf313ff21e4eb686a5acfd06dbf
+size 5951316
diff --git a/cmake-fix-module-loading-test.patch b/cmake-fix-module-loading-test.patch
index 6d599eb..bd0b0af 100644
--- a/cmake-fix-module-loading-test.patch
+++ b/cmake-fix-module-loading-test.patch
@@ -1,7 +1,7 @@
 diff -urN cmake-3.0.1.old/Modules/FindCurses.cmake cmake-3.0.1/Modules/FindCurses.cmake
 --- cmake-3.0.1.old/Modules/FindCurses.cmake	2014-09-01 10:01:38.114937449 +0200
 +++ cmake-3.0.1/Modules/FindCurses.cmake	2014-09-01 10:02:53.134937440 +0200
-@@ -39,6 +39,7 @@
+@@ -54,6 +54,7 @@ find_library(CURSES_CURSES_LIBRARY NAMES
  
  find_library(CURSES_NCURSES_LIBRARY NAMES ncurses )
  set(CURSES_USE_NCURSES FALSE)
diff --git a/cmake-fix-ruby-test.patch b/cmake-fix-ruby-test.patch
index f9af22a..5e4aed3 100644
--- a/cmake-fix-ruby-test.patch
+++ b/cmake-fix-ruby-test.patch
@@ -1,6 +1,6 @@
 --- cmake-3.0.0-rc2.orig/Modules/FindRuby.cmake	2014-03-17 19:18:29.000000000 +0100
 +++ cmake-3.0.0-rc2/Modules/FindRuby.cmake	2014-03-20 02:44:47.693351223 +0100
-@@ -116,7 +116,7 @@
+@@ -118,7 +118,7 @@ if(RUBY_EXECUTABLE  AND NOT  RUBY_VERSIO
     _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
  
     # vendor_ruby available ?
diff --git a/cmake-gui.changes b/cmake-gui.changes
index 146bbd3..fb04796 100644
--- a/cmake-gui.changes
+++ b/cmake-gui.changes
@@ -1,3 +1,48 @@
+-------------------------------------------------------------------
+Tue Oct 28 20:09:36 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 3.1.0~rc1
+ * Some of the more significant features of CMake 3.1 are:
+   * Windows Phone and Windows Store support has been added to
+     Visual Studio 11 (2012) and above Generators.
+   * NVIDIA Nsight Tegra support has been added to  Visual Studio
+     10 (2010) and above Generators.
+   * New "target_compile_features" command allows populating
+     target based compile features. CMake uses this information
+     to ensure that the compiler in use is capable of building the
+     target, and to add any necessary compile flags such as
+     -std=gnu++11 to support language features.
+     More information on this is found at:
+     http://www.cmake.org/cmake/help/v3.1/manual/cmake-compile-features.7.html
+   * The syntax for *Variable References* and *Escape Sequences* was simplified in
+  order to allow a much faster implementation. See policy "CMP0053".
+   * The "if" command no longer automatically dereferences
+     variables named in quoted or bracket arguments.  See policy "CMP0054".
+   * The target property "SOURCES" now generally supports "Generator
+     Expressions". The generator expressions may be used in the
+     "add_library" and "add_executable" commands.
+   * It is now possible to write and append to the target
+     property "SOURCES". The variable "CMAKE_DEBUG_TARGET_PROPERTIES"
+     can be used to trace the origin of sources.
+   * CPack gained "7Z" and "TXZ" generators supporting
+     lzma-compressed archives.
+   * The ExternalProject module has learned to support lzma-compressed
+     source tarballs with ".7z", ".tar.xz", and ".txz" extensions.
+   * The ExternalProject module ExternalProject_Add command
+     learned a new BUILD_ALWAYS option to cause the external project
+     build step to run every time the host project is built.
+   * The ctest_coverage command learned to support Intel coverage
+     files with the "codecov" tool.
+   * The ctest_memcheck command learned to support sanitizer modes,
+     including "AddressSanitizer", "MemorySanitizer", "ThreadSanitizer",
+     and "UndefinedBehaviorSanitizer".
+ * Deprecated and Removed Features:
+   * In CMake 3.0 the "target_link_libraries" command accidentally
+     began allowing unquoted arguments to use Generator Expressions
+     containing a semicolon separated list within them.
+     CMake 3.1 again requires the quotes for this to work correctly.
+- Added pkgconfig(liblzma) BuildRequires
+
 -------------------------------------------------------------------
 Fri Sep 12 17:01:21 UTC 2014 - idonmez@suse.com
 
diff --git a/cmake-gui.spec b/cmake-gui.spec
index d3802f6..2d53c4e 100644
--- a/cmake-gui.spec
+++ b/cmake-gui.spec
@@ -17,13 +17,14 @@
 
 
 Name:           cmake-gui
-Version:        3.0.2
+Version:        3.1.0~rc1
 Release:        0
+%define rversion 3.1.0-rc1
 Summary:        CMake graphical user interface
 License:        BSD-3-Clause
 Group:          Development/Tools/Building
 Url:            http://www.cmake.org/
-Source0:        http://www.cmake.org/files/v3.0/cmake-%{version}.tar.gz
+Source0:        http://www.cmake.org/files/v3.1/cmake-%{rversion}.tar.gz
 BuildRequires:  curl-devel
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -34,6 +35,7 @@ BuildRequires:  python-sphinx
 BuildRequires:  update-desktop-files
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(bzip2)
+BuildRequires:  pkgconfig(liblzma)
 Requires:       cmake
 Recommends:     cmake-man
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -55,7 +57,7 @@ Group:          Development/Tools/Building
 Manual pages for cmake, Cross-platform, open-source make system
 
 %prep
-%setup -q -n cmake-%{version}
+%setup -q -n cmake-%{rversion}
 
 %build
 EXTRA_FLAGS="--qt-gui"
diff --git a/cmake-ppc64le-jni.patch b/cmake-ppc64le-jni.patch
deleted file mode 100644
index e9a7774..0000000
--- a/cmake-ppc64le-jni.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 18ac6713e8657cca8fc791bcd581a47a7be6ebce Mon Sep 17 00:00:00 2001
-From: Dinar Valeev <dvaleev@suse.com>
-Date: Mon, 30 Jun 2014 18:29:20 +0200
-Subject: [PATCH] FindJNI: search for ppc64 on ppc64le as well
-
-IcedTea 2.5 have changed libarch for ppc64le to ppc64. Adjust FindJNI
-to look for both for backward compatibility.
-
-Signed-off-by: Dinar Valeev <dvaleev@suse.com>
----
- Modules/FindJNI.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
-index 6a496af..3dcb0d0 100644
---- a/Modules/FindJNI.cmake
-+++ b/Modules/FindJNI.cmake
-@@ -55,7 +55,7 @@ macro(java_append_library_directories _var)
-         # endianess of the underlying system.
-         set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb")
-     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le")
--        set(_java_libarch "ppc64le")
-+        set(_java_libarch "ppc64" "ppc64le")
-     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
-         set(_java_libarch "ppc64" "ppc")
-     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
--- 
-1.9.3
diff --git a/cmake.changes b/cmake.changes
index 1c70660..9236308 100644
--- a/cmake.changes
+++ b/cmake.changes
@@ -1,3 +1,49 @@
+-------------------------------------------------------------------
+Tue Oct 28 20:09:36 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 3.1.0~rc1
+ * Some of the more significant features of CMake 3.1 are:
+   * Windows Phone and Windows Store support has been added to
+     Visual Studio 11 (2012) and above Generators.
+   * NVIDIA Nsight Tegra support has been added to  Visual Studio
+     10 (2010) and above Generators.
+   * New "target_compile_features" command allows populating
+     target based compile features. CMake uses this information
+     to ensure that the compiler in use is capable of building the
+     target, and to add any necessary compile flags such as
+     -std=gnu++11 to support language features.
+     More information on this is found at:
+     http://www.cmake.org/cmake/help/v3.1/manual/cmake-compile-features.7.html
+   * The syntax for *Variable References* and *Escape Sequences* was simplified in
+  order to allow a much faster implementation. See policy "CMP0053".
+   * The "if" command no longer automatically dereferences
+     variables named in quoted or bracket arguments.  See policy "CMP0054".
+   * The target property "SOURCES" now generally supports "Generator
+     Expressions". The generator expressions may be used in the
+     "add_library" and "add_executable" commands.
+   * It is now possible to write and append to the target
+     property "SOURCES". The variable "CMAKE_DEBUG_TARGET_PROPERTIES"
+     can be used to trace the origin of sources.
+   * CPack gained "7Z" and "TXZ" generators supporting
+     lzma-compressed archives.
+   * The ExternalProject module has learned to support lzma-compressed
+     source tarballs with ".7z", ".tar.xz", and ".txz" extensions.
+   * The ExternalProject module ExternalProject_Add command
+     learned a new BUILD_ALWAYS option to cause the external project
+     build step to run every time the host project is built.
+   * The ctest_coverage command learned to support Intel coverage
+     files with the "codecov" tool.
+   * The ctest_memcheck command learned to support sanitizer modes,
+     including "AddressSanitizer", "MemorySanitizer", "ThreadSanitizer",
+     and "UndefinedBehaviorSanitizer".
+ * Deprecated and Removed Features:
+   * In CMake 3.0 the "target_link_libraries" command accidentally
+     began allowing unquoted arguments to use Generator Expressions
+     containing a semicolon separated list within them.
+     CMake 3.1 again requires the quotes for this to work correctly.
+- Added pkgconfig(liblzma) BuildRequires
+- Drop cmake-ppc64le-jni.patch, merged upstream
+
 -------------------------------------------------------------------
 Fri Oct 17 11:53:37 UTC 2014 - olaf@aepfle.de
 
diff --git a/cmake.spec b/cmake.spec
index 8defa67..0058108 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -17,18 +17,17 @@
 
 
 Name:           cmake
-Version:        3.0.2
+Version:        3.1.0~rc1
 Release:        0
+%define rversion 3.1.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.0/%{name}-%{version}.tar.gz
+Source0:        http://www.cmake.org/files/v3.1/%{name}-%{rversion}.tar.gz
 Source1:        cmake.macros
 Source2:        opensuse_rules.cmake
 Patch2:         cmake-fix-ruby-test.patch
-# PATCH-FIX-UPSTREAM dvaleev@suse.com https://github.com/Kitware/CMake/pull/111.patch
-Patch3:         cmake-ppc64le-jni.patch
 # PATCH-FIX-UPSTREAM: tchvatal@suse.com failing test due to include order
 Patch4:         cmake-fix-module-loading-test.patch
 BuildRequires:  curl-devel
@@ -37,6 +36,7 @@ BuildRequires:  gcc-c++
 BuildRequires:  libexpat-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig(liblzma)
 Requires:       make
 Recommends:     cmake-mans
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -49,9 +49,8 @@ BuildRequires:  libbz2-devel
 CMake is a cross-platform, open-source build system
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{rversion}
 %patch2 -p1
-%patch3 -p1
 %patch4 -p1
 
 %build

From 6d09b15f1449a9edf6d21b6365c942e8bfe06f3d533dfedb6fba75902ff51802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 14 Nov 2014 09:07:29 +0000
Subject: [PATCH 2/6] Accepting request 261506 from KDE:Unstable:Frameworks

Update to 3.1.0~rc2.
Preliminary testing shows linking problems are fixed, so from that side, it should be safe to push to Factory. Up to you though..

OBS-URL: https://build.opensuse.org/request/show/261506
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=181
---
 cmake-3.1.0-rc1.tar.gz              |  3 ---
 cmake-3.1.0-rc2.tar.gz              |  3 +++
 cmake-fix-module-loading-test.patch | 11 ---------
 cmake-gui.changes                   | 34 ++++++++++++++++++++++++++++
 cmake-gui.spec                      |  4 ++--
 cmake.changes                       | 35 +++++++++++++++++++++++++++++
 cmake.spec                          |  7 ++----
 7 files changed, 76 insertions(+), 21 deletions(-)
 delete mode 100644 cmake-3.1.0-rc1.tar.gz
 create mode 100644 cmake-3.1.0-rc2.tar.gz
 delete mode 100644 cmake-fix-module-loading-test.patch

diff --git a/cmake-3.1.0-rc1.tar.gz b/cmake-3.1.0-rc1.tar.gz
deleted file mode 100644
index 6449540..0000000
--- a/cmake-3.1.0-rc1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c71775595659e203f77f440fa6db5abdd3c1cbf313ff21e4eb686a5acfd06dbf
-size 5951316
diff --git a/cmake-3.1.0-rc2.tar.gz b/cmake-3.1.0-rc2.tar.gz
new file mode 100644
index 0000000..c1a9fb4
--- /dev/null
+++ b/cmake-3.1.0-rc2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e43f301c6739588ebd6d0f234ee6b8b5a938e170818d21f3cb41a19bf2642b6d
+size 5952829
diff --git a/cmake-fix-module-loading-test.patch b/cmake-fix-module-loading-test.patch
deleted file mode 100644
index bd0b0af..0000000
--- a/cmake-fix-module-loading-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN cmake-3.0.1.old/Modules/FindCurses.cmake cmake-3.0.1/Modules/FindCurses.cmake
---- cmake-3.0.1.old/Modules/FindCurses.cmake	2014-09-01 10:01:38.114937449 +0200
-+++ cmake-3.0.1/Modules/FindCurses.cmake	2014-09-01 10:02:53.134937440 +0200
-@@ -54,6 +54,7 @@ find_library(CURSES_CURSES_LIBRARY NAMES
- 
- find_library(CURSES_NCURSES_LIBRARY NAMES ncurses )
- set(CURSES_USE_NCURSES FALSE)
-+include(CheckLibraryExists)
- 
- if(CURSES_NCURSES_LIBRARY  AND ((NOT CURSES_CURSES_LIBRARY) OR CURSES_NEED_NCURSES))
-   set(CURSES_USE_NCURSES TRUE)
diff --git a/cmake-gui.changes b/cmake-gui.changes
index fb04796..4d781e3 100644
--- a/cmake-gui.changes
+++ b/cmake-gui.changes
@@ -1,3 +1,37 @@
+-------------------------------------------------------------------
+Thu Nov 13 20:26:40 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 3.1.0~rc2
+ * FindCurses: Include CheckLibraryExists before using it (#15220)
+ * Help: Clarify add_compile_options documentation (#15225)
+ * Help: Reference add_compile_options from add_definitions (#15225)
+ * KWSys: Fix configure_file call to use COPYONLY, not COPY_ONLY
+ * Qt4: Fix configure_file call to use COPYONLY, not COPY_ONLY
+ * FindIce: Drop use of :envvar: Sphinx markup
+ * Help: Drop TOC from latex manuals
+ * Help: Format add_library documented list of INTERFACE commands
+ * Help: Fix example in cmake-packages to avoid long line
+ * FindProtobuf: Cleanup reStructuredText documentation formatting
+ * Modules: Wrap long lines in pre-formatted documentation blocks
+ * Help: Tell latex to use a small font for cmake-language.7 productions
+ * Utilities/Sphinx: Fix html_favicon configuration
+ * Help: Update 3.1 release notes for dropping of FindITK and FindVTK
+ * Help: Wrap long lines in pre-formatted documentation blocks
+ * Help: Fix broken cross-references reported by 'nitpicky' option
+ * Xcode: Fix compiler path detection for iOS tools on Xcode <= 5.0 (#15237)
+ * ExternalProject: Restore logic to not download already-existing file
+ * Help: Link to GNUInstallDirs from CMAKE_INSTALL_PREFIX (#15246)
+ * Utilities/Sphinx: Add index entries for cross-references
+ * Help: Add 3.1 release note Emacs mode update
+ * Workaround for short jump tables on PA-RISC.
+ * genex: Preserve order while evaluating TARGET_OBJECTS
+ * Fix link line order when shared libraries are de-duplicated
+ * Help: Fix configure_file call to use COPYONLY, not COPY_ONLY
+ * Watcom: Drop symfile linker option
+ * Documentation: Fix minor typo thecommand -> the command
+ * cmake-mode.el: syntax of '_' should be treated as symbol
+ * KWSys SystemInformation: Check for _SC_AIX_REALMEM before using it
+
 -------------------------------------------------------------------
 Tue Oct 28 20:09:36 UTC 2014 - hrvoje.senjan@gmail.com
 
diff --git a/cmake-gui.spec b/cmake-gui.spec
index 2d53c4e..4ac838f 100644
--- a/cmake-gui.spec
+++ b/cmake-gui.spec
@@ -17,9 +17,9 @@
 
 
 Name:           cmake-gui
-Version:        3.1.0~rc1
+Version:        3.1.0~rc2
 Release:        0
-%define rversion 3.1.0-rc1
+%define rversion 3.1.0-rc2
 Summary:        CMake graphical user interface
 License:        BSD-3-Clause
 Group:          Development/Tools/Building
diff --git a/cmake.changes b/cmake.changes
index 9236308..b6c6551 100644
--- a/cmake.changes
+++ b/cmake.changes
@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Thu Nov 13 20:26:40 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 3.1.0~rc2
+ * FindCurses: Include CheckLibraryExists before using it (#15220)
+ * Help: Clarify add_compile_options documentation (#15225)
+ * Help: Reference add_compile_options from add_definitions (#15225)
+ * KWSys: Fix configure_file call to use COPYONLY, not COPY_ONLY
+ * Qt4: Fix configure_file call to use COPYONLY, not COPY_ONLY
+ * FindIce: Drop use of :envvar: Sphinx markup
+ * Help: Drop TOC from latex manuals
+ * Help: Format add_library documented list of INTERFACE commands
+ * Help: Fix example in cmake-packages to avoid long line
+ * FindProtobuf: Cleanup reStructuredText documentation formatting
+ * Modules: Wrap long lines in pre-formatted documentation blocks
+ * Help: Tell latex to use a small font for cmake-language.7 productions
+ * Utilities/Sphinx: Fix html_favicon configuration
+ * Help: Update 3.1 release notes for dropping of FindITK and FindVTK
+ * Help: Wrap long lines in pre-formatted documentation blocks
+ * Help: Fix broken cross-references reported by 'nitpicky' option
+ * Xcode: Fix compiler path detection for iOS tools on Xcode <= 5.0 (#15237)
+ * ExternalProject: Restore logic to not download already-existing file
+ * Help: Link to GNUInstallDirs from CMAKE_INSTALL_PREFIX (#15246)
+ * Utilities/Sphinx: Add index entries for cross-references
+ * Help: Add 3.1 release note Emacs mode update
+ * Workaround for short jump tables on PA-RISC.
+ * genex: Preserve order while evaluating TARGET_OBJECTS
+ * Fix link line order when shared libraries are de-duplicated
+ * Help: Fix configure_file call to use COPYONLY, not COPY_ONLY
+ * Watcom: Drop symfile linker option
+ * Documentation: Fix minor typo thecommand -> the command
+ * cmake-mode.el: syntax of '_' should be treated as symbol
+ * KWSys SystemInformation: Check for _SC_AIX_REALMEM before using it
+- Drop cmake-fix-module-loading-test.patch, merged upstream
+
 -------------------------------------------------------------------
 Tue Oct 28 20:09:36 UTC 2014 - hrvoje.senjan@gmail.com
 
diff --git a/cmake.spec b/cmake.spec
index 0058108..6cbe70d 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -17,9 +17,9 @@
 
 
 Name:           cmake
-Version:        3.1.0~rc1
+Version:        3.1.0~rc2
 Release:        0
-%define rversion 3.1.0-rc1
+%define rversion 3.1.0-rc2
 Summary:        Cross-platform, open-source make system
 License:        BSD-3-Clause
 Group:          Development/Tools/Building
@@ -28,8 +28,6 @@ Source0:        http://www.cmake.org/files/v3.1/%{name}-%{rversion}.tar.gz
 Source1:        cmake.macros
 Source2:        opensuse_rules.cmake
 Patch2:         cmake-fix-ruby-test.patch
-# PATCH-FIX-UPSTREAM: tchvatal@suse.com failing test due to include order
-Patch4:         cmake-fix-module-loading-test.patch
 BuildRequires:  curl-devel
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -51,7 +49,6 @@ CMake is a cross-platform, open-source build system
 %prep
 %setup -q -n %{name}-%{rversion}
 %patch2 -p1
-%patch4 -p1
 
 %build
 export CXXFLAGS="%{optflags}"

From a320783c3e49d8b441017c9ea16d7621ef2b7f2b4d81819f45d849b92fe91263 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 10 Dec 2014 18:36:00 +0000
Subject: [PATCH 3/6] Accepting request 264709 from KDE:Unstable:Frameworks

Update to 3.1.0~rc3

OBS-URL: https://build.opensuse.org/request/show/264709
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=182
---
 cmake-3.1.0-rc2.tar.gz |  3 --
 cmake-3.1.0-rc3.tar.gz |  3 ++
 cmake-gui.changes      | 63 ++++++++++++++++++++++++++++++++++++++++++
 cmake-gui.spec         |  4 +--
 cmake.changes          | 63 ++++++++++++++++++++++++++++++++++++++++++
 cmake.spec             |  4 +--
 6 files changed, 133 insertions(+), 7 deletions(-)
 delete mode 100644 cmake-3.1.0-rc2.tar.gz
 create mode 100644 cmake-3.1.0-rc3.tar.gz

diff --git a/cmake-3.1.0-rc2.tar.gz b/cmake-3.1.0-rc2.tar.gz
deleted file mode 100644
index c1a9fb4..0000000
--- a/cmake-3.1.0-rc2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e43f301c6739588ebd6d0f234ee6b8b5a938e170818d21f3cb41a19bf2642b6d
-size 5952829
diff --git a/cmake-3.1.0-rc3.tar.gz b/cmake-3.1.0-rc3.tar.gz
new file mode 100644
index 0000000..b896810
--- /dev/null
+++ b/cmake-3.1.0-rc3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b95d0f54bd352f0c430f960ce2914a099110a0e086c30c33d4f9ed6c6ba2ffc4
+size 5956392
diff --git a/cmake-gui.changes b/cmake-gui.changes
index 4d781e3..77e9bee 100644
--- a/cmake-gui.changes
+++ b/cmake-gui.changes
@@ -1,3 +1,66 @@
+-------------------------------------------------------------------
+Wed Dec 10 18:01:01 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 3.1.0~rc3
+ * Revert "ClearMatches: Only clear matches which were
+   actually set" (#15261)
+ * Help: Document COMPONENT option of install(SCRIPT/CODE)
+   (#14956)
+ * Do not use just-built CMake to install itself when
+   cross-compiling (#15248)
+ * KWSys SharedForward: Hard-code the ldpath buffer size to
+   below VS 14 limit
+ * VS: Rename VS 14 generator to 'Visual Studio 14 2015'
+ * Help: target_include_directories does not allow target names
+ * Utilities/Sphinx: Add missing call to note_explicit_target
+ * FindJava: Do not accept OS X stub 'java' as Java
+ * Fix lookup of source names after conversion to their actual
+   case (#15259)
+ * Help: Format set_property and get_property command docs
+ * Help: Add 3.1 release notes for INSTALL property scope
+ * CMakeParseImplicitLinkInfo: Fix implicit library logging
+ * Makefile: Do not create an empty linker response file
+ * FindOpenGL: Revert support for imported targets (#15267)
+ * Help: Document Nsight Tegra toolchain configuration (#15276)
+ * Utilities/Sphinx: Fix link targets for mixed-case command names
+ * Modules: Rename FindXerces to FindXercesC
+ * Help: Document file(GENERATE) signature option order
+ * VS: Add source file properties to set the hlsl shader entry
+   point and model
+ * Help: Remove duplicate '#' in CMP0053 valid character list
+ * Help: Add missing space to ctest -j option description
+ * FindwxWidgets: Add versions 3.0.1 and 3.0.2
+ * Help: Fix typo in cmake-compile-features(7) manual
+ * Help: Fix typo in CMAKE_CXX_KNOWN_FEATURES docs
+ * VS: Change Nsight Tegra 2.0 Project
+   Revision Number from 8 to 9
+ * Avoid if() quoted auto-dereference when checking for "MSVC"
+ * VS: Improve error messages when compiler
+   is not detected (#15228)
+ * VS: Do not produce WinMD file for OBJECT libraries (#15228)
+ * VS: Add source file property to specify Windows App
+   deployment location
+ * CPackIFW: Correction of the module documentation
+ * FindOpenMP: Use fixed form Fortran test program
+ * Help: Document installed file property API
+ * VS, WINCE: Fix entry point for Unicode builds
+ * FindPythonInterp: fix version component variables for
+   Python 1.4 (#15275)
+ * Features: Don't record for AppleClang
+ * Features: Test the CXX compiler only if it has features.
+ * Features: Fix references to CXX compiler
+   version in Clang-C.cmake.
+ * Features: Record C++11 dialect switch only for
+   GNU 4.7 and later.
+ * Features: Fix the default C dialect for Clang and GNU.
+ * Fix the test for running the CxxDialog unit test.
+ * WCDH: Don't imply that MSVC is supported by the module.
+ * WCDH: Make the header -Wundef safe for the C language.
+ * Genex: Fix evaluation context propagation for TARGET_OBJECTS.
+ * cmTarget: Don't allow relative paths in INTERFACE_SOURCES
+ * Export: Disallow export of targets with INTERFACE_SOURCES
+ * Help: Document the export limitation of INTERFACE_SOURCES.
+
 -------------------------------------------------------------------
 Thu Nov 13 20:26:40 UTC 2014 - hrvoje.senjan@gmail.com
 
diff --git a/cmake-gui.spec b/cmake-gui.spec
index 4ac838f..58a9c21 100644
--- a/cmake-gui.spec
+++ b/cmake-gui.spec
@@ -17,9 +17,9 @@
 
 
 Name:           cmake-gui
-Version:        3.1.0~rc2
+Version:        3.1.0~rc3
 Release:        0
-%define rversion 3.1.0-rc2
+%define rversion 3.1.0-rc3
 Summary:        CMake graphical user interface
 License:        BSD-3-Clause
 Group:          Development/Tools/Building
diff --git a/cmake.changes b/cmake.changes
index b6c6551..9aa42e2 100644
--- a/cmake.changes
+++ b/cmake.changes
@@ -1,3 +1,66 @@
+-------------------------------------------------------------------
+Wed Dec 10 18:01:01 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 3.1.0~rc3
+ * Revert "ClearMatches: Only clear matches which were
+   actually set" (#15261)
+ * Help: Document COMPONENT option of install(SCRIPT/CODE)
+   (#14956)
+ * Do not use just-built CMake to install itself when
+   cross-compiling (#15248)
+ * KWSys SharedForward: Hard-code the ldpath buffer size to
+   below VS 14 limit
+ * VS: Rename VS 14 generator to 'Visual Studio 14 2015'
+ * Help: target_include_directories does not allow target names
+ * Utilities/Sphinx: Add missing call to note_explicit_target
+ * FindJava: Do not accept OS X stub 'java' as Java
+ * Fix lookup of source names after conversion to their actual
+   case (#15259)
+ * Help: Format set_property and get_property command docs
+ * Help: Add 3.1 release notes for INSTALL property scope
+ * CMakeParseImplicitLinkInfo: Fix implicit library logging
+ * Makefile: Do not create an empty linker response file
+ * FindOpenGL: Revert support for imported targets (#15267)
+ * Help: Document Nsight Tegra toolchain configuration (#15276)
+ * Utilities/Sphinx: Fix link targets for mixed-case command names
+ * Modules: Rename FindXerces to FindXercesC
+ * Help: Document file(GENERATE) signature option order
+ * VS: Add source file properties to set the hlsl shader entry
+   point and model
+ * Help: Remove duplicate '#' in CMP0053 valid character list
+ * Help: Add missing space to ctest -j option description
+ * FindwxWidgets: Add versions 3.0.1 and 3.0.2
+ * Help: Fix typo in cmake-compile-features(7) manual
+ * Help: Fix typo in CMAKE_CXX_KNOWN_FEATURES docs
+ * VS: Change Nsight Tegra 2.0 Project
+   Revision Number from 8 to 9
+ * Avoid if() quoted auto-dereference when checking for "MSVC"
+ * VS: Improve error messages when compiler
+   is not detected (#15228)
+ * VS: Do not produce WinMD file for OBJECT libraries (#15228)
+ * VS: Add source file property to specify Windows App
+   deployment location
+ * CPackIFW: Correction of the module documentation
+ * FindOpenMP: Use fixed form Fortran test program
+ * Help: Document installed file property API
+ * VS, WINCE: Fix entry point for Unicode builds
+ * FindPythonInterp: fix version component variables for
+   Python 1.4 (#15275)
+ * Features: Don't record for AppleClang
+ * Features: Test the CXX compiler only if it has features.
+ * Features: Fix references to CXX compiler
+   version in Clang-C.cmake.
+ * Features: Record C++11 dialect switch only for
+   GNU 4.7 and later.
+ * Features: Fix the default C dialect for Clang and GNU.
+ * Fix the test for running the CxxDialog unit test.
+ * WCDH: Don't imply that MSVC is supported by the module.
+ * WCDH: Make the header -Wundef safe for the C language.
+ * Genex: Fix evaluation context propagation for TARGET_OBJECTS.
+ * cmTarget: Don't allow relative paths in INTERFACE_SOURCES
+ * Export: Disallow export of targets with INTERFACE_SOURCES
+ * Help: Document the export limitation of INTERFACE_SOURCES.
+
 -------------------------------------------------------------------
 Thu Nov 13 20:26:40 UTC 2014 - hrvoje.senjan@gmail.com
 
diff --git a/cmake.spec b/cmake.spec
index 6cbe70d..a753cdf 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -17,9 +17,9 @@
 
 
 Name:           cmake
-Version:        3.1.0~rc2
+Version:        3.1.0~rc3
 Release:        0
-%define rversion 3.1.0-rc2
+%define rversion 3.1.0-rc3
 Summary:        Cross-platform, open-source make system
 License:        BSD-3-Clause
 Group:          Development/Tools/Building

From e7c59c6c187ac2730092da345e4d02ab366239d0108208b23d5f273826cf9565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Thu, 11 Dec 2014 16:18:12 +0000
Subject: [PATCH 4/6] Accepting request 264751 from
 home:olh:branches:devel:tools:building

- Require libarchive 3 due to usage of archive_write_set_format_7zip

OBS-URL: https://build.opensuse.org/request/show/264751
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=183
---
 cmake-gui.changes | 5 +++++
 cmake-gui.spec    | 2 +-
 cmake.changes     | 5 +++++
 cmake.spec        | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/cmake-gui.changes b/cmake-gui.changes
index 77e9bee..3ebc346 100644
--- a/cmake-gui.changes
+++ b/cmake-gui.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Dec 11 07:57:44 UTC 2014 - olaf@aepfle.de
+
+- Require libarchive 3 due to usage of archive_write_set_format_7zip
+
 -------------------------------------------------------------------
 Wed Dec 10 18:01:01 UTC 2014 - hrvoje.senjan@gmail.com
 
diff --git a/cmake-gui.spec b/cmake-gui.spec
index 58a9c21..b183164 100644
--- a/cmake-gui.spec
+++ b/cmake-gui.spec
@@ -28,7 +28,7 @@ Source0:        http://www.cmake.org/files/v3.1/cmake-%{rversion}.tar.gz
 BuildRequires:  curl-devel
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
-BuildRequires:  libarchive-devel
+BuildRequires:  libarchive-devel >= 3.0.2
 BuildRequires:  libexpat-devel
 BuildRequires:  openssl-devel
 BuildRequires:  python-sphinx
diff --git a/cmake.changes b/cmake.changes
index 9aa42e2..e2b9c02 100644
--- a/cmake.changes
+++ b/cmake.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Dec 11 07:57:44 UTC 2014 - olaf@aepfle.de
+
+- Require libarchive 3 due to usage of archive_write_set_format_7zip
+
 -------------------------------------------------------------------
 Wed Dec 10 18:01:01 UTC 2014 - hrvoje.senjan@gmail.com
 
diff --git a/cmake.spec b/cmake.spec
index a753cdf..7717e71 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -39,7 +39,7 @@ Requires:       make
 Recommends:     cmake-mans
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} > 1110
-BuildRequires:  libarchive-devel
+BuildRequires:  libarchive-devel >= 3.0.2
 BuildRequires:  libbz2-devel
 %endif
 

From a87fd7baf9f71da826eab18fa491d6dee98fe27668d2139315906e30241efba5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Thu, 18 Dec 2014 06:29:46 +0000
Subject: [PATCH 5/6] Accepting request 265626 from KDE:Unstable:Frameworks

Update to 3.1 final

OBS-URL: https://build.opensuse.org/request/show/265626
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=184
---
 cmake-3.1.0-rc3.tar.gz | 3 ---
 cmake-3.1.0.tar.gz     | 3 +++
 cmake-gui.changes      | 7 +++++++
 cmake-gui.spec         | 4 ++--
 cmake.changes          | 7 +++++++
 cmake.spec             | 4 ++--
 6 files changed, 21 insertions(+), 7 deletions(-)
 delete mode 100644 cmake-3.1.0-rc3.tar.gz
 create mode 100644 cmake-3.1.0.tar.gz

diff --git a/cmake-3.1.0-rc3.tar.gz b/cmake-3.1.0-rc3.tar.gz
deleted file mode 100644
index b896810..0000000
--- a/cmake-3.1.0-rc3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b95d0f54bd352f0c430f960ce2914a099110a0e086c30c33d4f9ed6c6ba2ffc4
-size 5956392
diff --git a/cmake-3.1.0.tar.gz b/cmake-3.1.0.tar.gz
new file mode 100644
index 0000000..6c33b05
--- /dev/null
+++ b/cmake-3.1.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8bdc3fa3f2da81bc10c772a6b64cc9052acc2901d42e1e1b2588b40df224aad9
+size 5955836
diff --git a/cmake-gui.changes b/cmake-gui.changes
index 3ebc346..a6e6f9f 100644
--- a/cmake-gui.changes
+++ b/cmake-gui.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Dec 17 21:09:23 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 3.1 final:
+ * Help: Drop FeatureSummary example in cmake-developer.7
+ * Help: Extend policy CMP0054 documentation with an example
+
 -------------------------------------------------------------------
 Thu Dec 11 07:57:44 UTC 2014 - olaf@aepfle.de
 
diff --git a/cmake-gui.spec b/cmake-gui.spec
index b183164..ce4d351 100644
--- a/cmake-gui.spec
+++ b/cmake-gui.spec
@@ -17,9 +17,9 @@
 
 
 Name:           cmake-gui
-Version:        3.1.0~rc3
+Version:        3.1.0
 Release:        0
-%define rversion 3.1.0-rc3
+%define rversion %{version}
 Summary:        CMake graphical user interface
 License:        BSD-3-Clause
 Group:          Development/Tools/Building
diff --git a/cmake.changes b/cmake.changes
index e2b9c02..02f4abd 100644
--- a/cmake.changes
+++ b/cmake.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Dec 17 21:09:23 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 3.1 final:
+ * Help: Drop FeatureSummary example in cmake-developer.7
+ * Help: Extend policy CMP0054 documentation with an example
+
 -------------------------------------------------------------------
 Thu Dec 11 07:57:44 UTC 2014 - olaf@aepfle.de
 
diff --git a/cmake.spec b/cmake.spec
index 7717e71..54ae4c9 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -17,9 +17,9 @@
 
 
 Name:           cmake
-Version:        3.1.0~rc3
+Version:        3.1.0
 Release:        0
-%define rversion 3.1.0-rc3
+%define rversion %{version}
 Summary:        Cross-platform, open-source make system
 License:        BSD-3-Clause
 Group:          Development/Tools/Building

From adeb273de69da0b955b7e4b4bcec9b3b7bedb800f0d8568db7fdb2c567288f67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Mon, 12 Jan 2015 09:34:31 +0000
Subject: [PATCH 6/6] - Prefix swig python modules with _ to avoid clashes
 bnc#874885:   * cmake-prefix-swig.patch

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=185
---
 cmake-gui.spec          |  2 +-
 cmake-prefix-swig.patch | 13 +++++++++++++
 cmake.changes           |  6 ++++++
 cmake.spec              |  5 ++++-
 4 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 cmake-prefix-swig.patch

diff --git a/cmake-gui.spec b/cmake-gui.spec
index ce4d351..67a96ba 100644
--- a/cmake-gui.spec
+++ b/cmake-gui.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cmake-gui
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
diff --git a/cmake-prefix-swig.patch b/cmake-prefix-swig.patch
new file mode 100644
index 0000000..9b9aa31
--- /dev/null
+++ b/cmake-prefix-swig.patch
@@ -0,0 +1,13 @@
+Index: cmake-3.1.0/Modules/UseSWIG.cmake
+===================================================================
+--- cmake-3.1.0.orig/Modules/UseSWIG.cmake
++++ cmake-3.1.0/Modules/UseSWIG.cmake
+@@ -260,7 +260,7 @@ macro(SWIG_ADD_MODULE name language)
+     set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES PREFIX "")
+   elseif ("${swig_lowercase_language}" STREQUAL "python")
+     # this is only needed for the python case where a _modulename.so is generated
+-    set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES PREFIX "")
++    set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES PREFIX "_")
+     # Python extension modules on Windows must have the extension ".pyd"
+     # instead of ".dll" as of Python 2.5.  Older python versions do support
+     # this suffix.
diff --git a/cmake.changes b/cmake.changes
index 02f4abd..d41c3f1 100644
--- a/cmake.changes
+++ b/cmake.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 12 09:29:48 UTC 2015 - tchvatal@suse.com
+
+- Prefix swig python modules with _ to avoid clashes bnc#874885:
+  * cmake-prefix-swig.patch
+
 -------------------------------------------------------------------
 Wed Dec 17 21:09:23 UTC 2014 - hrvoje.senjan@gmail.com
 
diff --git a/cmake.spec b/cmake.spec
index 54ae4c9..09ee668 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cmake
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -28,6 +28,8 @@ Source0:        http://www.cmake.org/files/v3.1/%{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
 BuildRequires:  curl-devel
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -49,6 +51,7 @@ CMake is a cross-platform, open-source build system
 %prep
 %setup -q -n %{name}-%{rversion}
 %patch2 -p1
+%patch3 -p1
 
 %build
 export CXXFLAGS="%{optflags}"