From 037526045849e00976f132dbaeb8a3de697d8838 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 17 Sep 2015 21:15:06 -0600 Subject: [PATCH] Update to 3.3.2 --- .gitignore | 1 + cmake.git-371fe92e.patch | 35 ----------------------------------- cmake.spec | 11 +++++------ sources | 2 +- 4 files changed, 7 insertions(+), 42 deletions(-) delete mode 100644 cmake.git-371fe92e.patch diff --git a/.gitignore b/.gitignore index 1fd0e5c..9776ed4 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /cmake-3.3.0-rc3.tar.gz /cmake-3.3.0.tar.gz /cmake-3.3.1.tar.gz +/cmake-3.3.2.tar.gz diff --git a/cmake.git-371fe92e.patch b/cmake.git-371fe92e.patch deleted file mode 100644 index 522cc5c..0000000 --- a/cmake.git-371fe92e.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 371fe92e82ecadede532a211c1ec36f7039268d7 Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Thu, 27 Aug 2015 16:41:34 -0400 -Subject: [PATCH] Makefile: Print color escapes only when necessary - -Teach cmSystemTools::MakefileColorEcho to use the color printing API -only when we actually have a color to print. This avoids printing -escape sequences that do not change the text attributes. - -Since commit v3.3.0-rc1~480^2~4 (Makefile: Fix output during parallel -builds, 2015-02-05) we always use this code path to print progress and -rule messages even when color is disabled (e.g. in a try_compile). It -is important to avoid printing escapes when there is no color because on -MSYS we have no isatty and so assume that vt100 escapes are supported, -but we do not want to print them when capturing try_compile output. ---- - Source/cmSystemTools.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx -index e2adabe..b440a17 100644 ---- a/Source/cmSystemTools.cxx -+++ b/Source/cmSystemTools.cxx -@@ -2331,7 +2331,7 @@ void cmSystemTools::MakefileColorEcho(int color, const char* message, - assumeTTY = 0; - } - -- if(enabled) -+ if(enabled && color != cmsysTerminal_Color_Normal) - { - // Print with color. Delay the newline until later so that - // all color restore sequences appear before it. --- -1.7.10.4 - diff --git a/cmake.spec b/cmake.spec index 2f097f6..4e6ec2d 100644 --- a/cmake.spec +++ b/cmake.spec @@ -12,8 +12,8 @@ %endif Name: cmake -Version: 3.3.1 -Release: 5%{?dist} +Version: 3.3.2 +Release: 1%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -31,9 +31,6 @@ Source3: cmake.attr Source4: cmake.prov # Patch to find DCMTK in Fedora (bug #720140) Patch0: cmake-dcmtk.patch -# Patch to fix trycompile output -# http://www.cmake.org/gitweb?p=cmake.git;a=patch;h=371fe92e -Patch1: cmake.git-371fe92e.patch # Patch to fix RindRuby vendor settings # http://public.kitware.com/Bug/view.php?id=12965 # https://bugzilla.redhat.com/show_bug.cgi?id=822796 @@ -113,7 +110,6 @@ The %{name}-gui package contains the Qt based GUI for CMake. %setup -q -n %{name}-%{version}%{?rcver} # We cannot use backups with patches to Modules as they end up being installed %patch0 -p1 -%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch624 -p1 @@ -290,6 +286,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Thu Sep 17 2015 Orion Poplawski - 3.3.2-1 +- Update to 3.3.2 + * Fri Sep 11 2015 Orion Poplawski - 3.3.1-5 - Apply upstream patch to fix Fortran linker detection with redhat-hardened-ld (bug #1260490) diff --git a/sources b/sources index 991c0cc..4066cd1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -52638576f4e1e621fed6c3410d3a1b12 cmake-3.3.1.tar.gz +5febbd11bcaac854a27eebaf4a124be2 cmake-3.3.2.tar.gz