SHA256
3
0
forked from pool/cmake

Accepting request 290845 from home:mathletic:branches:devel:tools:building

update to CMake version 3.2.1

OBS-URL: https://build.opensuse.org/request/show/290845
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=203
This commit is contained in:
Tomáš Chvátal 2015-03-16 10:26:41 +00:00 committed by Git OBS Bridge
parent c8eedc1eeb
commit 3b8afb52bc
7 changed files with 62 additions and 16 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:50a394cf2efd9a92dd4114ebe2999489984ce6e6211b0d971930a90cbe7f0c1b
size 6436773

3
cmake-3.2.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:759f1cf6b1a26b037726a9acca6da501235c20ad3671df29d43f29052ef1502c
size 6437801

View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Sun Mar 15 12:02:10 UTC 2015 - foss@grueninger.de
- Update to 3.2.1
* Changes since 3.2.0~rc1
Makefile: Fix multiple custom command outputs regression (#15116)
configure_file: Do not warn about newline style arguments
Tests: Add more signature tests to RunCMake.configure_file test
Ninja: Improve internal check for generating at the top-level (#15436)
UseSWIG: Avoid if() auto-dereferene in quoted arguments
Diagnose invalid <LANG>_STANDARD value instead of crashing (#15426)
CPackRPM: Fix handling of relocation prefix parent directories
KWSys SystemTools: Update CopyFileAlways stream library workarounds
install: Write the entire installation manifest at once
Help: Revise configure_file documentation (#15403)
Help: In 3.2 relnotes move OpenGL/X11 to deprecated/removed section
Utilities/Release: Build OS X and Win binaries without OpenSSL
cmake-gui: Reset generator platform and toolset on configure (#15411)
FindJsonCpp: Drop new module due to upstream jsoncpp providing package
bootstrap: Add --(no-)system-jsoncpp options
FindCurses: Drop unused check for cbreak in tinfo library
FindJNI: Add arch-specific library dir for JDK 9 layout (#15408)
- Update system-libs.patch
-------------------------------------------------------------------
Thu Feb 19 15:05:10 UTC 2015 - hrvoje.senjan@gmail.com

View File

@ -17,14 +17,13 @@
Name: cmake-gui
Version: 3.2.0~rc1
Version: 3.2.1
Release: 0
%define rversion 3.2.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.2/cmake-%{rversion}.tar.gz
Source0: http://www.cmake.org/files/v3.2/cmake-%{version}.tar.gz
# 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
@ -65,7 +64,7 @@ Group: Development/Tools/Building
Manual pages for cmake, Cross-platform, open-source make system
%prep
%setup -q -n cmake-%{rversion}
%setup -q -n cmake-%{version}
%patch4 -p1
%patch5 -p1

View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Sun Mar 15 11:59:13 UTC 2015 - foss@grueninger.de
- Update to 3.2.1
* Changes since 3.2.0~rc1
Makefile: Fix multiple custom command outputs regression (#15116)
configure_file: Do not warn about newline style arguments
Tests: Add more signature tests to RunCMake.configure_file test
Ninja: Improve internal check for generating at the top-level (#15436)
UseSWIG: Avoid if() auto-dereferene in quoted arguments
Diagnose invalid <LANG>_STANDARD value instead of crashing (#15426)
CPackRPM: Fix handling of relocation prefix parent directories
KWSys SystemTools: Update CopyFileAlways stream library workarounds
install: Write the entire installation manifest at once
Help: Revise configure_file documentation (#15403)
Help: In 3.2 relnotes move OpenGL/X11 to deprecated/removed section
Utilities/Release: Build OS X and Win binaries without OpenSSL
cmake-gui: Reset generator platform and toolset on configure (#15411)
FindJsonCpp: Drop new module due to upstream jsoncpp providing package
bootstrap: Add --(no-)system-jsoncpp options
FindCurses: Drop unused check for cbreak in tinfo library
FindJNI: Add arch-specific library dir for JDK 9 layout (#15408)
- Update system-libs.patch
-------------------------------------------------------------------
Wed Mar 11 10:16:22 UTC 2015 - tchvatal@suse.com

View File

@ -17,14 +17,13 @@
Name: cmake
Version: 3.2.0~rc1
Version: 3.2.1
Release: 0
%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.2/%{name}-%{rversion}.tar.gz
Source0: http://www.cmake.org/files/v3.2/%{name}-%{version}.tar.gz
Source1: cmake.macros
Source2: opensuse_rules.cmake
Patch2: cmake-fix-ruby-test.patch
@ -58,7 +57,7 @@ BuildRequires: libbz2-devel
CMake is a cross-platform, open-source build system
%prep
%setup -q -n %{name}-%{rversion}
%setup -q -n %{name}-%{version}
%patch2 -p1
%patch4 -p1
%patch5 -p1

View File

@ -1,14 +1,14 @@
--- cmake-3.2.0-rc1/bootstrap.old 2015-02-13 15:25:48.000000000 +0100
+++ cmake-3.2.0-rc1/bootstrap 2015-02-14 03:52:26.509047998 +0100
@@ -637,10 +637,10 @@ while test $# != 0; do
--- cmake-3.2.1/bootstrap 2015-03-10 15:38:46.000000000 +0100
+++ cmake-3.2.1/bootstrap.old 2015-03-15 11:57:31.067275055 +0100
@@ -639,10 +639,10 @@
--init=*) cmake_init_file=`cmake_arg "$1"` ;;
--system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=1" ;;
--no-system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=0" ;;
- --system-bzip2|--system-curl|--system-expat|--system-libarchive|--system-zlib)
- --system-bzip2|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-zlib)
+ --system-bzip2|--system-curl|--system-expat|--system-form|--system-jsoncpp|--system-libarchive|--system-zlib)
lib=`cmake_arg "$1" "--system-"`
cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=1" ;;
- --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-libarchive|--no-system-zlib)
- --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-zlib)
+ --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-form|--no-system-jsoncpp|--no-system-libarchive|--no-system-zlib)
lib=`cmake_arg "$1" "--no-system-"`
cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=0" ;;