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 -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 ---- - 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