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

update to CMake 3.6.0

OBS-URL: https://build.opensuse.org/request/show/407576
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=254
This commit is contained in:
Martin Pluskal
2016-07-10 09:05:52 +00:00
committed by Git OBS Bridge
parent ad02e4d23b
commit ebbf5c10a8
12 changed files with 127 additions and 146 deletions

View File

@@ -17,19 +17,19 @@
Name: cmake
Version: 3.5.2
Version: 3.6.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.5/%{name}-%{version}.tar.gz
Source0: http://www.cmake.org/files/v3.6/%{name}-%{version}.tar.gz
Source1: cmake.macros
# bnc#947585 - Let CMake produces automatic RPM provides
Source3: cmake.attr
Source4: cmake.prov
Source5: http://www.cmake.org/files/v3.5/%{name}-%{version}-SHA-256.txt
Source6: http://www.cmake.org/files/v3.5/%{name}-%{version}-SHA-256.txt.asc
Source5: http://www.cmake.org/files/v3.6/%{name}-%{version}-SHA-256.txt
Source6: http://www.cmake.org/files/v3.6/%{name}-%{version}-SHA-256.txt.asc
Source7: cmake.keyring
Patch2: cmake-fix-ruby-test.patch
# PATCH-FIX-UPSTREAM form.patch -- set the correct include path for the ncurses includes
@@ -38,8 +38,6 @@ Patch4: form.patch
Patch5: system-libs.patch
# PATCH-FIX-SUSE cmake-version-in-generated-files.patch -- version number to be found in OBS
Patch6: cmake-version-in-generated-files.patch
# PATCH-FIX-UPSTREAM libarchive-version.patch -- Fix version detecting for libarchive 3.2
Patch7: libarchive-version.patch
BuildRequires: curl-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -72,7 +70,6 @@ echo "`grep %{name}-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'` %{SOU
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%build
export CXXFLAGS="%{optflags} -fPIE"
@@ -85,9 +82,6 @@ export LDFLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -pie"
--docdir=/share/doc/packages/%{name} \
--mandir=/share/man \
--system-libs \
%if 0%{?suse_version} <= 1110
--no-system-libarchive \
%endif
--no-system-jsoncpp \
--parallel=0%{jobs} \
--verbose \