Update to 3.1.0 final
This commit is contained in:
parent
7c502cd9c9
commit
a4a401c76b
1
.gitignore
vendored
1
.gitignore
vendored
@ -26,3 +26,4 @@
|
||||
/cmake-3.0.2.tar.gz
|
||||
/cmake-3.1.0-rc1.tar.gz
|
||||
/cmake-3.1.0-rc2.tar.gz
|
||||
/cmake-3.1.0.tar.gz
|
||||
|
@ -1,7 +1,7 @@
|
||||
diff -up cmake-2.8.11/Source/CMakeLists.txt\~ cmake-2.8.11/Source/CMakeLists.txt
|
||||
--- cmake-2.8.11/Source/CMakeLists.txt~ 2013-05-15 19:38:13.000000000 +0200
|
||||
+++ cmake-2.8.11/Source/CMakeLists.txt 2013-07-25 16:35:01.200389140 +0200
|
||||
@@ -308,6 +308,13 @@ if(APPLE)
|
||||
diff -up cmake-3.1.0/Source/CMakeLists.txt.strict_aliasing cmake-3.1.0/Source/CMakeLists.txt
|
||||
--- cmake-3.1.0/Source/CMakeLists.txt.strict_aliasing 2014-12-15 13:07:43.000000000 -0700
|
||||
+++ cmake-3.1.0/Source/CMakeLists.txt 2014-12-17 18:44:38.547555582 -0700
|
||||
@@ -388,6 +388,13 @@ if(APPLE)
|
||||
cmLocalXCodeGenerator.h)
|
||||
endif()
|
||||
|
||||
@ -15,5 +15,3 @@ diff -up cmake-2.8.11/Source/CMakeLists.txt\~ cmake-2.8.11/Source/CMakeLists.txt
|
||||
|
||||
if (WIN32)
|
||||
set(SRCS ${SRCS}
|
||||
|
||||
Diff finished. Thu Jul 25 16:35:18 2013
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Set to bcond_with or use --without gui to disable qt4 gui build
|
||||
%bcond_without gui
|
||||
# Set to RC version if building RC, else %{nil}
|
||||
%define rcver -rc2
|
||||
%define rcver %{nil}
|
||||
|
||||
%define rpm_macros_dir %{_sysconfdir}/rpm
|
||||
%if 0%{?fedora} > 18
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
Name: cmake
|
||||
Version: 3.1.0
|
||||
Release: 0.2.rc2%{?dist}
|
||||
Release: 1%{?dist}
|
||||
Summary: Cross-platform make system
|
||||
|
||||
Group: Development/Tools
|
||||
@ -227,6 +227,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Dec 17 2014 Orion Poplawski <orion@cora.nwra.com> - 3.1.0-1
|
||||
- Update to 3.1.0 final
|
||||
|
||||
* Sat Nov 15 2014 Orion Poplawski <orion@cora.nwra.com> - 3.1.0-0.2.rc2
|
||||
- Update to 3.1.0-rc2
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user