Accepting request 319049 from KDE:Unstable:Frameworks

Update to 3.3.0

OBS-URL: https://build.opensuse.org/request/show/319049
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=221
This commit is contained in:
Hrvoje Senjan
2015-07-28 04:25:43 +00:00
committed by Git OBS Bridge
parent 901d0cefab
commit 5b42b14b35
8 changed files with 411 additions and 88 deletions

View File

@@ -17,13 +17,13 @@
Name: cmake
Version: 3.2.3
Version: 3.3.0
Release: 0
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}-%{version}.tar.gz
Source0: http://www.cmake.org/files/v3.3/%{name}-%{version}.tar.gz
Source1: cmake.macros
Source2: opensuse_rules.cmake
Source3: cmake.attr
@@ -33,11 +33,6 @@ Patch2: cmake-fix-ruby-test.patch
Patch4: form.patch
# PATCH-FIX-UPSTREAM system-libs.patch -- allow choosing between bundled and system jsoncpp & form libs
Patch5: system-libs.patch
# PATCH-FIX-UPSTREAM cmake-fix-pie-binaries.patch -- new "file" is reporting PIE binaries a bit differently
# I sent this by email to cmake-developers.
Patch6: cmake-fix-pie-binaries.patch
# PATCH-FIX-UPSTREAM cmake.git-4552bc8.patch -- CPack/RPM architecture test fixup
Patch11: cmake.git-4552bc8.patch
BuildRequires: curl-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -66,8 +61,6 @@ CMake is a cross-platform, open-source build system
%patch2 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch11 -p1
%build
export CXXFLAGS="%{optflags}"
@@ -134,8 +127,9 @@ export PATH=$NPATH
# TestUpload: uses internet connection
# SimpleInstall: seems to fail due to RPATH strictness
# if any other app installs then this test is bogus
# suse specific brp-25-symlink cramps the symlinks, hence the CPackComponentsForAll-RPM-(default|OnePackPerGroup|IgnoreGroup|AllInOne) fail
./bin/ctest --force-new-ctest-process --output-on-failure %{?_smp_mflags} \
-E "(TestUpload|SimpleInstall|SimpleInstall-Stage2)"
-E "(TestUpload|SimpleInstall|SimpleInstall-Stage2|CPackComponentsForAll-RPM-(default|OnePackPerGroup|IgnoreGroup|AllInOne))"
%files
%defattr(-,root,root)